diff --git a/README.md b/README.md index 7ae692fd..d5fc11aa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# T-Pot 17.10 (Alpha) +# T-Pot 17.10 (Beta) This repository contains the necessary files to create the **[T-Pot](https://github.com/dtag-dev-sec/tpotce/releases)** ISO image. The image can then be used to install T-Pot on a physical or virtual machine. @@ -6,7 +6,7 @@ The image can then be used to install T-Pot on a physical or virtual machine. In October 2016 we released [T-Pot 16.10](http://dtag-dev-sec.github.io/mediator/feature/2016/10/31/t-pot-16.10.html) -# T-Pot 17.10 (Alpha - be careful there may be dragons!) +# T-Pot 17.10 (Beta) T-Pot 17.10 uses latest 16.04 LTS Ubuntu Server Network Installer image, is based on diff --git a/installer/usr/share/dict/a.txt b/installer/usr/share/dict/a.txt deleted file mode 100644 index 5eeebfac..00000000 --- a/installer/usr/share/dict/a.txt +++ /dev/null @@ -1,1466 +0,0 @@ -average -big -colossal -fat -giant -gigantic -great -huge -immense -large -little -long -mammoth -massive -miniature -petite -puny -short -small -tall -tiny - boiling -breezy -broken -bumpy -chilly -cold -cool -creepy -crooked -cuddly -curly -damaged -damp -dirty -dry -dusty -filthy -flaky -fluffy -wet -broad -chubby -crooked -curved -deep -flat -high -hollow -low -narrow -round -shallow -skinny -square -steep -straight -wide -ancient -brief -early -fast -late -long -modern -old -oldfashioned -quick -rapid -short -slow -swift -young -abundant -empty -few -heavy -light -many -numerous -Sound -cooing -deafening -faint -harsh -highpitched -hissing -hushed -husky -loud -melodic -moaning -mute -noisy -purring -quiet -raspy -resonant -screeching -shrill -silent -soft -squealing -thundering -voiceless -whispering -bitter -delicious -fresh -juicy -ripe -rotten -salty -sour -spicy -stale -sticky -strong -sweet -tasteless -tasty -thirsty -fluttering -fuzzy -greasy -grubby -hard -hot -icy -loose -melted -plastic -prickly -rainy -rough -scattered -shaggy -shaky -sharp -shivering -silky -slimy -slippery -smooth -soft -solid -steady -sticky -tender -tight -uneven -weak -wet -wooden -afraid -angry -annoyed -anxious -arrogant -ashamed -awful -bad -bewildered -bored -combative -condemned -confused -creepy -cruel -dangerous -defeated -defiant -depressed -disgusted -disturbed -eerie -embarrassed -envious -evil -fierce -foolish -frantic -frightened -grieving -helpless -homeless -hungry -hurt -ill -jealous -lonely -mysterious -naughty -nervous -obnoxious -outrageous -panicky -repulsive -scary -scornful -selfish -sore -tense -terrible -thoughtless -tired -troubled -upset -uptight -weary -wicked -worried -agreeable -amused -brave -calm -charming -cheerful -comfortable -cooperative -courageous -delightful -determined -eager -elated -enchanting -encouraging -energetic -enthusiastic -excited -exuberant -fair -faithful -fantastic -fine -friendly -funny -gentle -glorious - good -happy -healthy -helpful -hilarious -jolly -joyous -kind -lively -lovely -lucky -obedient -perfect -pleasant -proud -relieved -silly -smiling -splendid -successful -thoughtful -victorious -vivacious -witty -wonderful -zealous -zany -other -good -new -old -great -high -small -different -large -local -social -important -long -young -national -british -right -early -possible -big -little -political -able -late -general -full -far -low -public -available -bad -main -sure -clear -major -economic -only -likely -real -black -particular -international -special -difficult -certain -open -whole -white -free -short -easy -strong -european -central -similar -human -common -necessary -single -personal -hard -private -poor -financial -wide -foreign -simple -recent -concerned -american -various -close -fine -english -wrong -present -royal -natural -individual -nice -french -following -current -modern -labour -legal -happy -final -red -normal -serious -previous -total -prime -significant -industrial -sorry -dead -specific -appropriate -top -soviet -basic -military -original -successful -aware -hon -popular -heavy -professional -direct -dark -cold -ready -green -useful -effective -western -traditional -scottish -german -independent -deep -interesting -considerable -involved -physical -left -hot -existing -responsible -complete -medical -blue -extra -past -male -interested -fair -essential -beautiful -civil -primary -obvious -future -environmental -positive -senior -nuclear -annual -relevant -huge -rich -commercial -safe -regional -practical -official -separate -key -chief -regular -due -additional -active -powerful -complex -standard -impossible -light -warm -middle -fresh -sexual -front -domestic -actual -united -technical -ordinary -cheap -strange -internal -excellent -quiet -soft -potential -northern -religious -quick -very -famous -cultural -proper -broad -joint -formal -limited -conservative -lovely -usual -ltd -unable -rural -initial -substantial -christian -bright -average -leading -reasonable -immediate -suitable -equal -detailed -working -overall -female -afraid -democratic -growing -sufficient -scientific -eastern -correct -inc -irish -expensive -educational -mental -dangerous -critical -increased -familiar -unlikely -double -perfect -slow -tiny -dry -historical -thin -daily -southern -increasing -wild -alone -urban -empty -married -narrow -liberal -supposed -upper -apparent -tall -busy -bloody -prepared -russian -moral -careful -clean -attractive -japanese -vital -thick -alternative -fast -ancient -elderly -rare -external -capable -brief -wonderful -grand -typical -entire -grey -constant -vast -surprised -ideal -terrible -academic -funny -minor -pleased -severe -ill -corporate -negative -permanent -weak -brown -fundamental -odd -crucial -inner -used -criminal -contemporary -sharp -sick -near -roman -massive -unique -secondary -parliamentary -african -unknown -subsequent -angry -alive -guilty -lucky -enormous -well -communist -yellow -unusual -net -longterm -tough -dear -extensive -glad -remaining -agricultural -alright -healthy -italian -principal -tired -efficient -comfortable -chinese -relative -friendly -conventional -willing -sudden -proposed -voluntary -slight -valuable -dramatic -golden -temporary -federal -keen -flat -silent -indian -videotaped -worried -pale -statutory -welsh -dependent -firm -wet -competitive -armed -radical -outside -acceptable -sensitive -living -pure -global -emotional -sad -secret -rapid -adequate -fixed -sweet -administrative -wooden -remarkable -comprehensive -surprising -solid -rough -mere -mass -brilliant -maximum -absolute -tory -electronic -visual -electric -cool -spanish -literary -continuing -supreme -chemical -genuine -exciting -written -stupid -advanced -extreme -classical -fit -favourite -socialist -widespread -confident -straight -catholic -proud -numerous -opposite -distinct -mad -helpful -given -disabled -consistent -anxious -nervous -awful -stable -constitutional -satisfied -conscious -developing -strategic -holy -smooth -dominant -remote -theoretical -outstanding -pink -pretty -clinical -minimum -honest -impressive -related -residential -extraordinary -plain -visible -accurate -distant -still -greek -complicated -musical -precise -gentle -broken -live -silly -fat -tight -monetary -round -psychological -violent -unemployed -inevitable -junior -sensible -grateful -pleasant -dirty -structural -welcome -socalled -deaf -above -continuous -blind -overseas -mean -entitled -delighted -loose -occasional -evident -desperate -fellow -universal -square -steady -classic -equivalent -intellectual -victorian -level -ultimate -creative -lost -medieval -clever -linguistic -convinced -judicial -raw -sophisticated -asleep -vulnerable -illegal -outer -revolutionary -bitter -changing -australian -native -imperial -strict -wise -informal -flexible -collective -frequent -experimental -spiritual -intense -rational -ethnic -generous -inadequate -prominent -logical -bare -historic -modest -dutch -acute -electrical -valid -weekly -gross -automatic -loud -reliable -mutual -liable -multiple -ruling -curious -arab -sole -jewish -managing -pregnant -latin -nearby -exact -underlying -identical -satisfactory -marginal -distinctive -electoral -urgent -presidential -controversial -oral -everyday -encouraging -organic -continued -expected -statistical -desirable -innocent -improved -exclusive -marked -experienced -unexpected -superb -sheer -disappointed -frightened -fulltime -gastric -capitalist -romantic -naked -reluctant -magnificent -convenient -established -closed -uncertain -artificial -diplomatic -tremendous -marine -mechanical -retail -institutional -mixed -required -biological -known -functional -straightforward -superior -digital -parttime -spectacular -unhappy -confused -unfair -aggressive -spare -painful -abstract -asian -associated -legislative -monthly -intelligent -hungry -explicit -nasty -just -faint -coloured -ridiculous -amazing -comparable -successive -workingclass -realistic -back -decent -unnecessary -flying -fucking -random -influential -dull -genetic -neat -marvellous -crazy -damp -giant -secure -bottom -skilled -subtle -elegant -brave -lesser -parallel -steep -intensive -casual -tropical -lonely -partial -preliminary -concrete -alleged -assistant -vertical -upset -delicate -mild -occupational -excessive -progressive -iraqi -exceptional -integrated -striking -continental -okay -harsh -combined -fierce -handsome -characteristic -chronic -compulsory -interim -objective -splendid -magic -shortterm -systematic -obliged -payable -fun -horrible -primitive -fascinating -ideological -metropolitan -surrounding -estimated -peaceful -premier -operational -technological -kind -advisory -hostile -precious -gay -accessible -determined -excited -impressed -provincial -smart -endless -isolated -postwar -drunk -geographical -like -dynamic -boring -forthcoming -unfortunate -definite -super -notable -indirect -stiff -wealthy -awkward -lively -neutral -artistic -content -mature -colonial -ambitious -evil -magnetic -verbal -legitimate -sympathetic -wellknown -empirical -head -shallow -vague -naval -depressed -shared -added -shocked -mid -worthwhile -qualified -missing -blank -absent -favourable -polish -israeli -developed -profound -representative -enthusiastic -dreadful -rigid -reduced -cruel -coastal -peculiar -racial -ugly -swiss -crude -extended -selected -eager -feminist -canadian -bold -relaxed -corresponding -running -planned -applicable -immense -allied -comparative -uncomfortable -conservation -productive -beneficial -bored -charming -minimal -mobile -turkish -orange -rear -passive -suspicious -overwhelming -fatal -resulting -symbolic -registered -neighbouring -calm -irrelevant -patient -compact -profitable -rival -loyal -moderate -distinguished -interior -noble -insufficient -eligible -mysterious -varying -middleclass -managerial -molecular -olympic -linear -prospective -printed -parental -diverse -elaborate -furious -fiscal -burning -useless -semantic -embarrassed -inherent -philosophical -deliberate -awake -variable -promising -unpleasant -varied -sacred -selective -inclined -tender -hidden -worthy -intermediate -sound -protective -fortunate -slim -islamic -defensive -divine -stuck -driving -invisible -misleading -circular -mathematical -inappropriate -liquid -persistent -solar -doubtful -manual -architectural -intact -incredible -devoted -prior -tragic -respectable -optimistic -convincing -unacceptable -decisive -competent -spatial -respective -binding -relieved -nursing -toxic -select -redundant -integral -then -probable -amateur -fond -passing -specified -territorial -horizontal -oldfashioned -inland -cognitive -regulatory -miserable -resident -polite -scared -marxist -gothic -civilian -instant -lengthy -adverse -korean -unconscious -anonymous -aesthetic -orthodox -static -unaware -costly -fantastic -foolish -fashionable -causal -compatible -wee -implicit -dual -ok -cheerful -subjective -forward -surviving -exotic -purple -cautious -visiting -aggregate -ethical -protestant -teenage -largescale -dying -disastrous -delicious -confidential -underground -thorough -grim -autonomous -atomic -frozen -colourful -injured -uniform -ashamed -glorious -wicked -coherent -rising -shy -novel -balanced -delightful -arbitrary -adjacent -psychiatric -worrying -weird -unchanged -rolling -evolutionary -intimate -sporting -disciplinary -formidable -lexical -noisy -gradual -accused -homeless -supporting -coming -renewed -excess -retired -rubber -chosen -outdoor -embarrassing -preferred -bizarre -appalling -agreed -imaginative -governing -accepted -vocational -palestinian -mighty -puzzled -worldwide -handicapped -organisational -sunny -eldest -eventual -spontaneous -vivid -rude -nineteenthcentury -faithful -ministerial -innovative -controlled -conceptual -unwilling -civic -meaningful -disturbing -alive -brainy -breakable -busy -careful -cautious -clever -concerned -crazy -curious -dead -different -difficult -doubtful -easy -famous -fragile -helpful -helpless -important - impossible -innocent -inquisitive -modern -open -outstanding -poor -powerful -puzzled -real -rich -shy -sleepy -stupid -super -tame -uninterested -wandering -wild -wrong - adorable -alert -average -beautiful -blonde -bloody -blushing -bright -clean -clear -cloudy -colorful -crowded -cute -dark -drab -distinct -dull -elegant -fancy -filthy -glamorous -gleaming -graceful -grotesque -homely -light -misty -motionless -muddy -plain -poised -quaint -shiny -smoggy -sparkling -spotless -stormy -strange -ugly -unsightly -unusual -bad -better -beautiful -big -black -blue -bright -clumsy -crazy -dizzy -dull -fat -frail -friendly -funny -great -green -gigantic -gorgeous -grumpy -handsome -happy -horrible -itchy -jittery -jolly -kind -long -lazy -magnificent -magenta -many -mighty -mushy -nasty -new -nice -nosy -nutty -nutritious -odd -orange -ordinary -pretty -precious -prickly -purple -quaint -quiet -quick -quickest -rainy -rare -ratty -red -roasted -robust -round -sad -scary -scrawny -short -silly -stingy -strange -striped -spotty -tart -tall -tame -tan -tender -testy -tricky -tough -ugly -ugliest -vast -watery -wasteful -wideeyed -wonderful -yellow -yummy -zany diff --git a/installer/usr/share/dict/n.txt b/installer/usr/share/dict/n.txt deleted file mode 100644 index 5af1952e..00000000 --- a/installer/usr/share/dict/n.txt +++ /dev/null @@ -1,4401 +0,0 @@ -aardvark -abacus -abbey -abdomen -ability -abolishment -abroad -accelerant -accelerator -accident -accompanist -accordion -account -accountant -achieve -achiever -acid -acknowledgment -acoustic -acoustics -acrylic -act -action -active -activity -actor -actress -acupuncture -ad -adapter -addiction -addition -address -adjustment -administration -adrenalin -adult -advancement -advantage -advertisement -advertising -advice -affair -affect -afghanistan -africa -aftermath -afternoon -aftershave -aftershock -afterthought -age -agency -agenda -agent -aglet -agreement -air -airbag -airbus -airfare -airforce -airline -airmail -airplane -airport -airship -alarm -alb -albatross -alcohol -alcove -alder -algebra -algeria -alibi -allergist -alley -alligator -alloy -almanac -almond -alpaca -alpenglow -alpenhorn -alpha -alphabet -alternative -altitude -alto -aluminium -aluminum -ambassador -ambition -ambulance -amendment -america -amount -amusement -anagram -analgesia -analog -analysis -analyst -anatomy -anesthesiology -anethesiologist -anger -angiosperm -angle -angora -angstrom -anguish -animal -anime -ankle -anklet -annual -anorak -answer -ant -antarctica -anteater -antechamber -antelope -anthony -anthropology -antler -anxiety -anybody -anything -anywhere -apartment -ape -aperitif -apology -apparatus -apparel -appeal -appearance -appendix -apple -applewood -appliance -application -appointment -approval -april -apron -apse -aquarius -aquifer -arch -archaeology -archeology -archer -architect -architecture -archrival -area -argentina -argument -aries -arithmetic -arm -armadillo -armament -armchair -armoire -armor -armrest -army -arrival -arrow -art -artichoke -article -artificer -ascot -ash -ashram -ashtray -asia -asparagus -aspect -asphalt -assignment -assistance -assistant -associate -association -assumption -asterisk -astrakhan -astrolabe -astrologer -astrology -astronomy -atelier -athelete -athlete -atm -atmosphere -atom -atrium -attachment -attack -attempt -attendant -attention -attenuation -attic -attitude -attorney -attraction -audience -auditorium -august -aunt -australia -author -authorisation -authority -authorization -automaton -avalanche -avenue -average -awareness -azimuth -babe -babies -baboon -babushka -baby -back -backbone -backdrop -backpack -bacon -bad -badge -badger -bafflement -bag -bagel -bagpipe -bagpipes -bail -bait -bake -baker -bakery -bakeware -balaclava -balalaika -balance -balcony -balinese -ball -balloon -ballpark -bamboo -banana -band -bandana -bandanna -bandolier -bangladesh -bangle -banjo -bank -bankbook -banker -banquette -baobab -bar -barbara -barbeque -barber -barbiturate -barge -baritone -barium -barn -barometer -barracks -barstool -base -baseball -basement -basin -basis -basket -basketball -bass -bassinet -bassoon -bat -bath -bather -bathhouse -bathrobe -bathroom -bathtub -batter -battery -batting -battle -battleship -bay -bayou -beach -bead -beak -beam -bean -beanie -beanstalk -bear -beard -beast -beat -beautician -beauty -beaver -bed -bedroom -bee -beech -beef -beer -beet -beetle -beggar -beginner -begonia -behavior -beheading -behest -belfry -belief -believe -bell -belligerency -bellows -belly -belt -bench -bend -beneficiary -benefit -bengal -beret -berry -bestseller -bestseller -betty -beverage -beyond -bibliography -bicycle -bid -bidet -bifocals -big -bigrig -bijou -bike -bikini -bill -billboard -bin -biology -biplane -birch -bird -birdbath -birdcage -birdhouse -birdwatcher -birth -birthday -bit -bite -black -blackberry -blackboard -blackfish -bladder -blade -blame -blank -blanket -blazer -blight -blinker -blister -blizzard -block -blocker -blood -bloodflow -bloom -bloomers -blossom -blouse -blow -blowgun -blowhole -blue -blueberry -boar -board -boat -boatbuilding -boatload -boatyard -bobcat -body -bog -bolero -bolt -bomb -bomber -bondsman -bone -bongo -bonnet -bonsai -bonus -boogeyman -book -bookcase -bookend -booklet -booster -boot -bootee -bootie -boots -booty -border -bore -bosom -botany -bottle -bottling -bottom -bottomline -boudoir -bough -boundary -bow -bower -bowl -bowler -bowling -bowtie -box -boxer -boxspring -boy -boyfriend -bra -brace -bracelet -bracket -brain -brake -branch -brand -brandy -brass -brassiere -bratwurst -brazil -bread -breadcrumb -break -breakfast -breakpoint -breast -breastplate -breath -breeze -bribery -brick -bricklaying -bridge -brief -briefs -brilliant -british -broccoli -brochure -broiler -broker -brome -bronchitis -bronco -bronze -brooch -brood -brook -broom -brother -brotherinlaw -brow -brown -brush -brushfire -brushing -bubble -bucket -buckle -bud -budget -buffer -buffet -bug -buggy -bugle -building -bulb -bull -bulldozer -bullet -bullfighter -bumper -bun -bunch -bungalow -bunghole -bunkhouse -burglar -burlesque -burma -burn -burnout -burst -bus -bush -business -bust -bustle -butane -butcher -butter -button -buy -buyer -buzzard -cabana -cabbage -cabin -cabinet -cable -caboose -cacao -cactus -caddy -cadet -cafe -caftan -cake -calcification -calculation -calculator -calculus -calendar -calf -calico -call -calm -camel -cameo -camera -camp -campaign -campanile -can -canada -canal -cancel -cancer -candelabra -candidate -candle -candy -cane -cannon -canoe -canon -canopy -canteen -canvas -cap -cape -capital -capitulation -capon -cappelletti -cappuccino -capricorn -captain -caption -car -caravan -carbon -card -cardboard -cardigan -care -cargo -carload -carnation -carol -carotene -carp -carpenter -carpet -carport -carriage -carrier -carrot -carry -cart -cartilage -cartload -cartoon -cartridge -cascade -case -casement -cash -cashier -casino -casserole -cassock -cast -castanet -castanets -castle -cat -catacomb -catamaran -category -caterpillar -cathedral -catsup -cattle -cauliflower -cause -caution -cave -cclamp -cd -ceiling -celebration -celeriac -celery -celeste -cell -cellar -cello -celsius -cement -cemetery -cenotaph -census -cent -centenarian -center -centimeter -centurion -century -cephalopod -ceramic -cereal -certification -cesspool -chador -chafe -chain -chainstay -chair -chairlift -chairman -chairperson -chairwoman -chaise -chalet -chalice -chalk -champion -championship -chance -chandelier -change -channel -chap -chapel -chapter -character -chard -charge -charity -charlatan -charles -charm -chart -chastity -chasuble -chateau -chauffeur -chauvinist -check -checkroom -cheek -cheese -cheetah -chef -chemistry -cheque -cherries -cherry -chess -chest -chick -chicken -chicory -chief -chiffonier -child -childhood -children -chill -chime -chimpanzee -chin -china -chinese -chino -chipmunk -chitchat -chivalry -chive -chocolate -choice -choker -chop -chopstick -chord -chowder -christmas -christopher -chrome -chromolithograph -chronograph -chronometer -chub -chug -church -churn -cicada -cigarette -cinema -circle -circulation -circumference -cirrus -citizenship -city -civilisation -clam -clank -clapboard -clarinet -clasp -class -classroom -claus -clave -clavicle -clavier -cleaner -cleat -cleavage -clef -cleric -clerk -click -client -cliff -climate -climb -clip -clipper -cloak -cloakroom -clock -clockwork -clogs -cloister -close -closet -cloth -clothes -clothing -cloud -cloudburst -cloudy -clove -clover -club -clutch -coach -coal -coast -coat -cob -cobweb -cockpit -cockroach -cocktail -cocoa -cod -codon -codpiece -coevolution -coffee -coffin -coil -coin -coinsurance -coke -cold -coliseum -collar -collection -college -collision -colloquia -colombia -colon -colonisation -colony -color -colt -column -columnist -comb -combat -combination -comfort -comfortable -comic -comma -command -commercial -commission -committee -communicant -communication -community -company -comparison -competition -competitor -complaint -complement -complex -component -comportment -composer -composition -compost -compulsion -computer -comradeship -concept -concert -conclusion -concrete -condition -condominium -condor -conductor -cone -confectionery -conference -confidence -confirmation -conflict -confusion -conga -congo -congressman -congressperson -congresswoman -conifer -connection -consent -consequence -console -consonant -conspirator -constant -constellation -construction -consul -consulate -contact lens -contagion -contest -context -continent -contract -contrail -contrary -contribution -control -convection -conversation -convert -convertible -cook -cookie -cooking -coonskin -cope -copout -copper -coproducer -copy -copyright -copywriter -cord -corduroy -cork -cormorant -corn -cornerstone -cornet -corral -correspondent -corridor -corsage -cost -costume -cot -cottage -cotton -couch -cougar -cough -council -councilman -councilor -councilperson -councilwoman -counter -counterforce -countess -country -county -couple -courage -course -court -cousin -covariate -cover -coverall -cow -cowbell -cowboy -crab -crack -cracker -crackers -cradle -craftsman -crash -crate -cravat -craw -crawdad -crayfish -crayon -cream -creative -creator -creature -creche -credenza -credit -creditor -creek -creme brulee -crest -crew -crib -cribbage -cricket -cricketer -crime -criminal -crinoline -criteria -criterion -criticism -crocodile -crocus -croissant -crook -crop -cross -crosscontamination -crossstitch -crotch -croup -crow -crowd -crown -crude -crush -cry -crystallography -cub -cuban -cuckoo -cucumber -cufflinks -cultivar -cultivator -culture -culvert -cummerbund -cup -cupboard -cupcake -cupola -curio -curl -curler -currency -current -cursor -curtain -curve -cushion -custard -custodian -customer -cut -cuticle -cutlet -cutover -cutting -cyclamen -cycle -cyclone -cylinder -cymbal -cymbals -cynic -cyst -cytoplasm -dad -daffodil -dagger -dahlia -daisy -damage -dame -dance -dancer -danger -daniel -dark -dart -dash -dashboard -data -database -date -daughter -david -day -daybed -dead -deadline -deal -dealer -dear -death -deathwatch -deborah -debt -debtor -decade -december -decimal -decision -deck -declination -decongestant -decrease -decryption -dedication -deer -defense -deficit -definition -deformation -degree -delete -delivery -demand -demur -den -denim -dentist -deodorant -department -departure -dependent -deployment -deposit -depression -depressive -depth -deputy -derby -derrick -description -desert -design -designer -desire -desk -dessert -destiny -destroyer -destruction -detail -detainment -detective -detention -determination -development -deviance -device -dew -dhow -diadem -diamond -diaphragm -diarist -dibble -dickey -dictaphone -diction -dictionary -diet -dietician -difference -differential -difficulty -digestion -digger -digital -dilapidation -dill -dime -dimension -dimple -diner -dinghy -dinner -dinosaur -diploma -dipstick -direction -director -dirndl -dirt -disadvantage -disarmament -disaster -disco -disconnection -discount -discovery -discrepancy -discussion -disease -disembodiment -disengagement -disguise -disgust -dish -dishes -dishwasher -disk -display -disposer -distance -distribution -distributor -district -divan -diver -divide -divider -diving -division -dock -doctor -document -doe -dog -dogsled -dogwood -doll -dollar -dolman -dolphin -domain -donald -donkey -donna -door -doorknob -doorpost -dorothy -dory -dot -double -doubling -doubt -doubter -downforce -downgrade -downtown -draft -dragon -dragonfly -dragster -drain -drake -drama -dramaturge -draw -drawbridge -drawer -drawing -dream -dredger -dress -dresser -dressing -drill -drink -drive -driver -driveway -driving -drizzle -dromedary -drop -drug -drum -drummer -drunk -dry -dryer -duck -duckling -dud -duffel -dugout -dulcimer -dumbwaiter -dump truck -dune buggy -dungarees -dungeon -duplexer -dust -dust storm -duster -duty -dwarf -dwelling -dynamo -eagle -ear -eardrum -earmuffs -earplug -earrings -earth -earthquake -earthworm -ease -easel -east -eave -eavesdropper -ebook -ecclesia -eclipse -ecliptic -economics -ecumenist -eddy -edge -edger -editor -editorial -education -edward -eel -effacement -effect -effective -efficacy -efficiency -effort -egg -egghead -eggnog -eggplant -egypt -eight -ejector -elbow -election -electrocardiogram -element -elephant -elevator -elixir -elizabeth -elk -ellipse -elm -elongation -embossing -emergence -emergent -emery -emotion -emphasis -employ -employee -employer -employment -empowerment -emu -encirclement -encyclopedia -end -endothelium -enemy -energy -engine -engineer -engineering -english -enigma -enquiry -entertainment -enthusiasm -entrance -entry -environment -epauliere -epee -ephemera -ephemeris -epoch -eponym -epoxy -equinox -equipment -era -ereader -error -escape -espadrille -espalier -establishment -estate -estimate -estrogen -estuary -ethernet -ethiopia -euphonium -eurocentrism -europe -evaluator -evening -eveningwear -event -eviction -evidence -evocation -exam -examination -examiner -example -exchange -excitement -exclamation -excuse -executor -exhaust -exhusband -exile -existence -exit -expansion -expansionism -experience -expert -explanation -exposition -expression -extension -extent -extreme -exwife -eye -eyeball -eyebrow -eyebrows -eyeglasses -eyelash -eyelashes -eyelid -eyelids -eyeliner -eyestrain -face -facelift -facet -facilities -facsimile -fact -factor -factory -faculty -fahrenheit -failure -fairies -fairy -fall -fallingout -familiar -family -fan -fang -fanlight -fanny -fannypack -farm -farmer -fascia -fat -father -fatherinlaw -fatigues -faucet -fault -fawn -fax -fear -feast -feather -feature -february -fedelini -fedora -feed -feedback -feeling -feet -felony -female -fen -fence -fencing -fender -ferry -ferryboat -fertilizer -few -fiber -fiberglass -fibre -fiction -fiddle -field -fifth -fight -fighter -figurine -file -fill -filly -filth -final -finance -find -finding -fine -finger -fingernail -finisher -fir -fire -fireman -fireplace -firewall -fish -fishbone -fisherman -fishery -fishing -fishmonger -fishnet -fisting -fix -fixture -flag -flame -flanker -flare -flash -flat -flatboat -flavor -flax -fleck -fleece -flesh -flight -flintlock -flipflops -flock -flood -floor -floozie -flower -flu -flugelhorn -fluke -flute -fly -flytrap -foam -fob -focus -fog -fold -folder -fondue -font -food -foot -football -footnote -footrest -footrest -footstool -foray -force -forearm -forebear -forecast -forehead -forest -forestry -forgery -fork -form -formal -format -former -fort -fortnight -fortress -fortune -forum -foundation -fountain -fowl -fox -foxglove -fragrance -frame -france -fratricide -fraudster -frazzle -freckle -freedom -freeplay -freeze -freezer -freight -freighter -french -freon -fresco -friction -friday -fridge -friend -friendship -frigate -fringe -frock -frog -front -frost -frown -fruit -frustration -fuel -fulfillment -full -function -fundraising -funeral -funny -fur -furnace -furniture -fusarium -futon -future -gaffer -gaiters -gale -gallbladder -galleon -gallery -galley -gallon -galoshes -game -gamebird -gammaray -gander -gap -garage -garb -garbage -garden -garlic -garment -garter -gas -gasoline -gastropod -gate -gateway -gather -gauge -gauntlet -gazebo -gazelle -gear -gearshift -geese -gelding -gem -gemini -gemsbok -gender -gene -general -genetics -geography -geology -geometry -george -geranium -gerbil -geriatrician -german -germany -geyser -ghana -gherkin -ghost -giant -gigantism -ginseng -giraffe -girdle -girl -girlfriend -git -glad -gladiolus -gland -glass -glasses -glen -glider -gliding -glockenspiel -glove -gloves -glue -glut -goal -goat -gobbler -godmother -goggles -gokart -gold -goldfish -golf -gondola -gong -good -goodbye -goodbye -goodie -goose -gopher -goretex -gorilla -gosling -governance -government -governor -gown -grabbag -grade -grain -gram -granddaughter -grandfather -grandmom -grandmother -grandson -granny -grape -grapefruit -graph -graphic -grass -grasshopper -grassland -gray -grease -great -greatgrandfather -greatgrandmother -greece -greek -green -greenhouse -grenade -grey -grief -grill -grip -grit -grocery -ground -group -grouper -grouse -growth -guarantee -guatemalan -guest -guestbook -guidance -guide -guilty -guitar -guitarist -gum -gumshoes -gun -gutter -guy -gym -gymnast -gynaecology -gyro -hacienda -hacksaw -hackwork -hail -hair -haircut -half -halfbrother -halfsister -halibut -hall -hallway -hamaki -hamburger -hammer -hammock -hamster -hand -handball -handholding -handicap -handle -handlebar -handmaiden -handsaw -hang -harbor -harbour -hardboard -hardcover -hardening -hardhat -hardhat -hardware -harm -harmonica -harmony -harp -harpooner -harpsichord -hassock -hat -hatbox -hatchet -hate -haunt -haversack -hawk -hay -head -headlight -headline -headrest -health -hearing -heart -heartache -hearth -hearthside -heartthrob -heartwood -heat -heater -heaven -heavy -hedge -hedgehog -heel -height -heirloom -helen -helicopter -helium -hell -hellcat -helmet -helo -help -hemp -hen -herb -heron -herring -hexagon -heyday -hide -high -highlight -highrise -highway -hill -himalayan -hip -hippodrome -hippopotamus -historian -history -hit -hive -hobbies -hobbit -hobby -hockey -hoe -hog -hold -hole -holiday -home -homework -homogenate -homonym -honey -honeybee -honoree -hood -hoof -hook -hope -hops -horn -hornet -horse -hose -hosiery -hospice -hospital -host -hostel -hostess -hot -hotdog -hotel -hour -hourglass -house -houseboat -housing -hovel -hovercraft -howitzer -hub -hubcap -hugger -human -humidity -humor -hunger -hurdler -hurricane -hurry -hurt -husband -hut -hutch -hyacinth -hybridisation -hydrant -hydraulics -hydrofoil -hydrogen -hyena -hygienic -hyphenation -hypochondria -hypothermia -ice -icebreaker -icecream -icecream -icicle -icon -idea -ideal -igloo -ikebana -illegal -image -imagination -impact -implement -importance -impress -impression -imprisonment -improvement -impudence -impulse -inbox -incandescence -inch -income -increase -independence -independent -index -india -indication -indigence -indonesia -industry -infancy -inflammation -inflation -information -infusion -inglenook -ingrate -initial -initiative -injoke -injury -ink -inlaws -inlay -inn -innervation -innocent -input -inquiry -inscription -insect -inside -insolence -inspection -inspector -instance -instruction -instrument -instrumentalist -instrumentation -insulation -insurance -insurgence -intelligence -intention -interaction -interactive -interest -interferometer -interior -interloper -internal -internet -interpreter -intervenor -interview -interviewer -intestine -intestines -introduction -invention -inventor -inventory -investment -invite -invoice -iPad -iran -iraq -iridescence -iris -iron -ironclad -island -israel -issue -italy -jackal -jacket -jaguar -jail -jailhouse -jam -james -january -japan -japanese -jar -jasmine -jason -jaw -jeans -jeep -jeff -jelly -jellyfish -jennifer -jet -jewel -jewelry -jiffy -job -jockey -jodhpurs -joey -jogging -john -join -joke -joseph -jot -journey -judge -judgment -judo -juggernaut -juice -july -jumbo -jump -jumper -jumpsuit -june -junior -junk -junker -junket -jury -justice -jute -kale -kamikaze -kangaroo -karate -karen -kayak -kazoo -kendo -kenneth -kenya -ketch -ketchup -kettle -kettledrum -kevin -key -keyboard -keyboarding -keystone -kick -kickoff -kid -kidney -kidneys -kielbasa -kill -kilogram -kilometer -kilt -kimberly -kimono -kind -king -kingfish -kiosk -kiss -kitchen -kite -kitten -kitty -kleenex -klomps -knee -kneejerk -knickers -knife -knifeedge -knight -knitting -knot -knowledge -knuckle -koala -kohlrabi -korean -lab -laborer -lace -lacquerware -ladder -lady -ladybug -lake -lamb -lamp -lan -lanai -land -landform -landmine -language -lantern -lap -laparoscope -lapdog -laptop -larch -larder -lark -laryngitis -lasagna -latency -latex -lathe -latte -laugh -laundry -laura -law -lawn -lawsuit -lawyer -layer -lead -leader -leadership -leaf -league -leaker -learning -leash -leather -leaver -lecture -leek -leg -legal -legging -legume -lei -lemon -lemonade -lemur -length -lentil -leo -leopard -leotard -leprosy -let -letter -lettuce -level -lever -leverage -libra -librarian -library -license -lier -life -lift -light -lighting -lightning -lilac -lily -limit -limo -line -linen -liner -link -linseed -lion -lip -lipstick -liquid -liquor -lisa -list -literature -litigation -litter -liver -living -lizard -llama -loaf -loafer -loan -lobotomy -lobster -location -lock -locker -locket -locomotive -locust -loft -log -loggia -loincloth -look -loss -lot -lotion -lounge -lout -love -low -loyalty -luck -luggage -lumber -lumberman -lunch -luncheonette -lunchroom -lung -lunge -lute -luttuce -lycra -lye -lymphocyte -lynx -lyocell -lyre -lyric -macadamia -macaroni -machine -macrame -macrofauna -maelstrom -maestro -magazine -magic -magician -maid -maiden -mail -mailbox -mailman -maintenance -major -majorleague -makeup -malaysia -male -mall -mallet -mambo -mammoth -man -management -manager -mandarin -mandolin -mangrove -manhunt -maniac -manicure -manner -manor -mansard -manservant -mansion -mantel -mantle -mantua -manufacturer -manx -map -maple -maraca -maracas -marble -march -mare -margaret -margin -maria -mariachi -marimba -mark -market -marketing -marksman -marriage -marsh -marshland -marxism -mary -mascara -mask -mass -massage -master -mastication -mastoid -mat -match -material -math -mattock -mattress -maximum -may -maybe -mayonnaise -mayor -meal -meaning -measure -measurement -meat -mechanic -media -medicine -medium -meet -meeting -megalomaniac -melody -member -membership -memory -men -menorah -mention -menu -mercury -mess -message -metal -metallurgist -meteor -meteorology -meter -methane -method -methodology -metro -metronome -mexican -mexico -mezzanine -mice -michael -michelle -microlending -microwave -midcourse -middle -middleman -midi -midline -midnight -midwife -might -migrant -mile -milk -milkshake -millennium -millimeter -millisecond -mime -mimosa -mind -mine -mini -minibus -minion -miniskirt -minister -minor -minorleague -mint -minute -mirror -miscarriage -miscommunication -misfit -misogyny -misplacement -misreading -missile -mission -mist -mistake -mister -miter -mitten -mix -mixer -mixture -moat -mobile -moccasins -mocha -mode -model -modem -mole -mom -moment -monastery -monasticism -monday -money -monger -monitor -monkey -monocle -monotheism -monsoon -monster -month -mood -moon -moonscape -moonshine -mop -Mormon -morning -morocco -morsel -mortise -mosque -mosquito -most -motel -moth -mother -motherinlaw -motion -motor -motorboat -motorcar -motorcycle -mound -mountain -mouse -mouser -mousse -moustache -mouth -mouton -move -mover -movie -mower -mud -mug -mukluk -mule -multimedia -muscle -musculature -museum -music -musicbox -musician -musicmaking -mustache -mustard -mutt -myanmar -mycoplasma -nail -name -naming -nancy -nanoparticle -napkin -narcissus -nation -naturalisation -nature -neat -neck -necklace -necktie -necromancer -need -needle -negligee -negotiation -neologism -neon -nepal -nephew -nerve -nest -net -netball -netbook -netsuke -network -neurobiologist -neuropathologist -neuropsychiatry -news -newspaper -newsprint -newsstand -nexus -nic -nicety -niche -nickel -niece -nigeria -night -nightclub -nightgown -nightingale -nightlight -nitrogen -node -noise -nonbeliever -nonconformist -nondisclosure -noodle -normal -norse -north -north america -north korea -nose -note -notebook -notice -notify -notoriety -nougat -novel -november -nudge -number -numeracy -numeric -numismatist -nurse -nursery -nurture -nut -nylon -oak -oar -oasis -oatmeal -obi -objective -obligation -oboe -observation -observatory -occasion -occupation -ocean -ocelot -octagon -octave -octavo -octet -october -octopus -odometer -oeuvre -offence -offer -office -official -offramp -oil -okra -oldie -olive -omega -omelet -oncology -one -onion -open -opening -opera -operation -ophthalmologist -opinion -opium -opossum -opportunist -opportunity -opposite -option -orange -orangutan -orator -orchard -orchestra -orchid -order -ordinary -ordination -organ -organisation -organization -original -ornament -osmosis -osprey -ostrich -others -otter -ottoman -ounce -outback -outcome -outfit -outhouse -outlay -output -outrigger -outset -outside -oval -ovary -oven -overcharge -overclocking -overcoat -overexertion -overflight -overnighter -overshoot -owl -owner -ox -oxen -oxford -oxygen -oyster -pacemaker -pack -package -packet -pad -paddle -paddock -page -pagoda -pail -pain -paint -painter -painting -paintwork -pair -pajama -pajamas -pakistan -paleontologist -paleontology -palm -pamphlet -pan -pancake -pancreas -panda -panic -pannier -panpipe -pansy -panther -panties -pantry -pants -pantsuit -panty -pantyhose -paper -paperback -parable -parachute -parade -parallelogram -paramedic -parcel -parchment -parent -parentheses -park -parka -parrot -parsnip -part -participant -particle -particular -partner -partridge -party -passage -passbook -passenger -passion -passive -pasta -paste -pastor -pastoralist -pastry -patch -path -patience -patient -patina -patio -patriarch -patricia -patrimony -patriot -patrol -pattern -paul -pavement -pavilion -paw -pawnshop -payee -payment -pea -peace -peach -peacoat -peacock -peak -peanut -pear -pearl -pedal -pedestrian -pediatrician -peen -peer -peertopeer -pegboard -pelican -pelt -pen -penalty -pencil -pendant -pendulum -penicillin -pension -pentagon -peony -people -pepper -percentage -perception -perch -performance -perfume -period -periodical -peripheral -permafrost -permission -permit -perp -person -personality -perspective -peru -pest -pet -petal -petticoat -pew -pharmacist -pharmacopoeia -phase -pheasant -philippines -philosopher -philosophy -phone -photo -photographer -phrase -physical -physician -physics -pianist -piano -piccolo -pick -pickax -picket -pickle -picture -pie -piece -pier -piety -pig -pigeon -pike -pile -pilgrimage -pillbox -pillow -pilot -pimp -pimple -pin -pinafore -pincenez -pine -pineapple -pinecone -ping -pink -pinkie -pinstripe -pint -pinto -pinworm -pioneer -pipe -piracy -piranha -pisces -piss -pitch -pitching -pith -pizza -place -plain -plane -planet -plant -plantation -planter -plaster -plasterboard -plastic -plate -platform -platinum -platypus -play -player -playground -playroom -pleasure -pleated -plier -plot -plough -plover -plow -plowman -plume -plunger -plywood -pneumonia -pocket -pocketbook -pocketwatch -poem -poet -poetry -poignance -point -poison -poisoning -poland -pole -polenta -police -policeman -policy -polish -politician -politics -pollution -polo -polyester -pompom -poncho -pond -pony -poof -pool -popcorn -poppy -popsicle -population -populist -porch -porcupine -port -porter -portfolio -porthole -position -positive -possession -possibility -postage -postbox -poster -pot -potato -potential -potty -pouch -poultry -pound -pounding -powder -power -precedent -precipitation -preface -preference -prelude -premeditation -premier -preoccupation -preparation -presence -presentation -president -pressroom -pressure -pressurisation -price -pride -priest -priesthood -primary -primate -prince -princess -principal -print -printer -priority -prison -prize -prizefight -probation -problem -procedure -process -processing -produce -producer -product -production -profession -professional -professor -profit -program -project -promotion -prompt -proofreader -propane -property -proposal -prose -prosecution -protection -protest -protocol -prow -pruner -pseudoscience -psychiatrist -psychoanalyst -psychologist -psychology -ptarmigan -publisher -pudding -puddle -puffin -pull -pulley -puma -pump -pumpkin -pumpkinseed -punch -punishment -pupa -pupil -puppy -purchase -puritan -purple -purpose -purse -push -pusher -put -pvc -pyjama -pyramid -quadrant -quail -quality -quantity -quart -quarter -quartz -queen -question -quicksand -quiet -quill -quilt -quince -quit -quiver -quotation -rabbi -rabbit -raccoon -race -racer -racing -racist -rack -radar -radiator -radio -radiosonde -radish -raffle -raft -rag -rage -rail -railway -raiment -rain -rainbow -raincoat -rainmaker -rainstorm -raise -rake -ram -rambler -ramie -ranch -random -randomisation -range -rank -raspberry -rat -rate -ratio -raven -ravioli -raw -rawhide -ray -rayon -reactant -reaction -read -reading -reality -reamer -rear -reason -receipt -reception -recess -recipe -recliner -recognition -recommendation -record -recorder -recording -recover -recruit -rectangle -red -redesign -rediscovery -reduction -reef -refectory -reflection -refrigerator -refund -refuse -region -register -regret -regular -regulation -reindeer -reinscription -reject -relation -relationship -relative -religion -relish -reminder -rent -repair -reparation -repeat -replace -replacement -replication -reply -report -representative -reprocessing -republic -reputation -request -requirement -resale -research -resident -resist -resolution -resource -respect -respite -response -responsibility -rest -restaurant -result -retailer -rethinking -retina -retouch -return -reveal -revenant -revenue -review -revolution -revolve -revolver -reward -rheumatism -rhinoceros -rhyme -rhythm -rice -richard -riddle -ride -rider -ridge -rifle -right -rim -ring -ringworm -ripple -rise -riser -risk -river -riverbed -rivulet -road -roadway -roast -robe -robert -robin -rock -rocker -rocket -rocketship -rod -role -roll -roller -romania -ronald -roof -room -rooster -root -rope -rose -rostrum -rotate -roundabout -route -router -routine -row -rowboat -royal -rub -rubber -rubric -ruckus -ruffle -rugby -rule -run -runaway -runner -russia -rutabaga -ruth -sabre -sack -sad -saddle -safe -safety -sage -sagittarius -sail -sailboat -sailor -salad -salary -sale -salesman -salmon -salon -saloon -salt -samovar -sampan -sample -samurai -sand -sandals -sandbar -sandra -sandwich -santa -sarah -sardine -sari -sarong -sash -satellite -satin -satire -satisfaction -saturday -sauce -saudi arabia -sausage -save -saving -savior -saviour -saw -saxophone -scale -scallion -scanner -scarecrow -scarf -scarification -scene -scent -schedule -scheme -schizophrenic -schnitzel -school -schoolhouse -schooner -science -scimitar -scissors -scooter -score -scorn -scorpio -scorpion -scow -scraper -screamer -screen -screenwriting -screw -screwdriver -screwup -scrim -scrip -sculpting -sculpture -sea -seagull -seal -seaplane -search -seashore -season -seat -second -secretariat -secretary -section -sectional -sector -secure -security -seed -seeder -segment -select -selection -self -sell -semicircle -semicolon -senator -sense -sentence -sepal -september -septicaemia -series -servant -server -service -session -set -setting -settler -sewer -sex -shack -shade -shadow -shadowbox -shake -shakedown -shaker -shallot -shame -shampoo -shanty -shape -share -shark -sharon -shawl -shearling -shears -sheath -shed -sheep -sheet -shelf -shell -sherry -shield -shift -shin -shine -shingle -ship -shirt -shirtdress -shoat -shock -shoe -shoehorn -shoehorn -shoelace -shoemaker -shoes -shoestring -shofar -shoot -shootdown -shop -shopper -shopping -shore -shortage -shorts -shortwave -shot -shoulder -shovel -show -shower -showstopper -shred -shrimp -shrine -siamese -sibling -sick -side -sideboard -sideburns -sidecar -sidestream -sidewalk -siding -sign -signature -signet -significance -signup -silica -silk -silkworm -sill -silo -silver -simple -sing -singer -single -sink -sir -sister -sisterinlaw -sit -sitar -situation -size -skate -skiing -skill -skin -skirt -skulduggery -skull -skullcap -skullduggery -skunk -sky -skylight -skyscraper -skywalk -slapstick -slash -slave -sled -sledge -sleep -sleet -sleuth -slice -slider -slime -slip -slipper -slippers -slope -sloth -smash -smell -smelting -smile -smock -smog -smoke -smuggling -snail -snake -snakebite -sneakers -sneeze -snob -snorer -snow -snowboarding -snowflake -snowman -snowmobiling -snowplow -snowstorm -snowsuit -snuggle -soap -soccer -society -sociology -sock -socks -soda -sofa -softball -softdrink -softening -software -soil -soldier -solid -solitaire -solution -sombrero -somersault -somewhere -son -song -songbird -sonnet -soot -soprano -sorbet -sort -soulmate -sound -soup -source -sourwood -sousaphone -south -south africa -south america -south korea -sow -soy -soybean -space -spacing -spade -spaghetti -spain -spandex -spank -spark -sparrow -spasm -speaker -speakerphone -spear -special -specialist -specific -spectacle -spectacles -spectrograph -speech -speedboat -spend -sphere -sphynx -spider -spike -spinach -spine -spiral -spirit -spiritual -spite -spleen -split -sponge -spoon -sport -spot -spotlight -spray -spread -spring -sprinter -sprout -spruce -spume -spur -spy -square -squash -squatter -squeegee -squid -squirrel -stable -stack -stacking -stadium -staff -stag -stage -stain -stair -staircase -stallion -stamen -stamina -stamp -stance -standoff -star -start -starter -state -statement -station -stationwagon -statistic -statistician -steak -steal -steam -steamroller -steel -steeple -stem -stencil -step -stepaunt -stepbrother -stepdaughter -stepdaughter -stepfather -stepgrandfather -stepgrandmother -stepmother -stepmother -steppingstone -steps -stepsister -stepson -stepson -stepuncle -steven -stew -stick -stiletto -still -stinger -stitch -stock -stocking -stockings -stockintrade -stole -stomach -stone -stonework -stool -stop -stopsign -stopwatch -storage -store -storey -storm -story -storyboard -storytelling -stove -strait -stranger -strap -strategy -straw -strawberry -stream -street -streetcar -stress -stretch -strike -string -strip -structure -struggle -stud -student -studio -study -stuff -stumbling -sturgeon -style -styling -stylus -subcomponent -subconscious -submarine -subroutine -subsidence -substance -suburb -subway -success -suck -sudan -suede -suffocation -sugar -suggestion -suit -suitcase -sultan -summer -sun -sunbeam -sunbonnet -sunday -sundial -sunflower -sunglasses -sunlamp -sunroom -sunshine -supermarket -supply -support -supporter -suppression -surface -surfboard -surgeon -surgery -surname -surprise -susan -sushi -suspect -suspenders -sustainment -SUV -swallow -swamp -swan -swath -sweat -sweater -sweats -sweatshirt -sweatshop -sweatsuit -swedish -sweets -swell -swim -swimming -swimsuit -swing -swiss -switch -switchboard -swivel -sword -swordfish -sycamore -sympathy -syndicate -synergy -synod -syria -syrup -system -tabby -tabernacle -table -tablecloth -tabletop -tachometer -tackle -tadpole -tail -tailor -tailspin -taiwan -tale -talk -tam -tambour -tambourine -tamo'shanter -tandem -tangerine -tank -tanker -tankful -tanktop -tanzania -tap -target -tassel -taste -tatami -tattler -tattoo -taurus -tavern -tax -taxi -taxicab -tea -teacher -teaching -team -tear -technician -technologist -technology -teen -teeth -telephone -telescreen -teletype -television -teller -temp -temper -temperature -temple -tempo -temporariness -temptress -tendency -tenement -tennis -tenor -tension -tent -tepee -term -terracotta -terrapin -territory -test -text -textbook -texture -thailand -thanks -thaw -theater -theism -theme -theoretician -theory -therapist -thermals -thermometer -thigh -thing -thinking -thistle -thomas -thong -thongs -thorn -thought -thread -thrill -throat -throne -thrush -thumb -thunder -thunderbolt -thunderhead -thunderstorm -thursday -tiara -tic -ticket -tie -tiger -tight -tights -tile -till -timbale -time -timeline -timeout -timer -timpani -tin -tinderbox -tinkle -tintype -tip -tire -tissue -titanium -title -toad -toast -toe -toenail -toga -togs -toilet -tom -tomato -tomography -tomorrow -tomtom -ton -tongue -toot -tooth -toothbrush -toothpaste -toothpick -top -tophat -topic -topsail -toque -torchiere -toreador -tornado -torso -tortellini -tortoise -tosser -total -tote -touch -tough -toughguy -tour -tourist -towel -tower -town -townhouse -towtruck -toy -trachoma -track -tracksuit -tractor -trade -tradition -traditionalism -traffic -trail -trailer -train -trainer -training -tram -tramp -transaction -translation -transmission -transom -transport -transportation -trapdoor -trapezium -trapezoid -trash -travel -tray -treatment -tree -trellis -tremor -trench -trial -triangle -tribe -trick -trigonometry -trim -trinket -trip -tripod -trolley -trombone -trooper -trouble -trousers -trout -trove -trowel -truck -truckit -trumpet -trunk -trust -truth -try -tshirt -tsunami -tub -tuba -tube -tuesday -tugboat -tulip -tummy -tuna -tune -tuneup -tunic -tunnel -turban -turkey -turkish -turn -turnip -turnover -turnstile -turret -turtle -tussle -tutu -tuxedo -tv -twig -twilight -twine -twist -twister -two -typewriter -typhoon -tyvek -uganda -ukraine -ukulele -umbrella -unblinking -uncle -underclothes -underground -underneath -underpants -underpass -undershirt -understanding -underwear -underwire -unibody -uniform -union -unit -united kingdom -university -urn -use -user -usher -utensil -uzbekistan -vacation -vacuum -vagrant -valance -valley -valuable -value -van -vane -vanity -variation -variety -vase -vast -vault -vaulting -veal -vegetable -vegetarian -vehicle -veil -vein -veldt -vellum -velodrome -velvet -venezuela -venezuelan -venom -veranda -verdict -vermicelli -verse -version -vertigo -verve -vessel -vest -vestment -vibe -vibraphone -vibration -video -vietnam -view -villa -village -vineyard -vinyl -viola -violet -violin -virginal -virgo -virtue -virus -viscose -vise -vision -visit -visitor -visor -vixen -voice -volcano -volleyball -volume -voyage -vulture -wad -wafer -waffle -waist -waistband -waiter -waitress -walk -walker -walkway -wall -wallaby -wallet -walnut -walrus -wampum -wannabe -war -warden -warlock -warmup -warning -wash -washbasin -washcloth -washer -washtub -wasp -waste -wastebasket -watch -watchmaker -water -waterbed -waterfall -waterskiing -waterspout -wave -wax -way -weakness -wealth -weapon -weasel -weather -web -wedding -wedge -wednesday -weed -weeder -weedkiller -week -weekend -weekender -weight -weird -well -west -western -wetbar -wetsuit -whale -wharf -wheel -whip -whirlpool -whirlwind -whisker -whiskey -whistle -white -whole -wholesale -wholesaler -whorl -wife -wilderness -will -william -willow -wind -windage -windchime -window -windscreen -windshield -wine -wing -wingman -wingtip -winner -winter -wire -wiseguy -wish -wisteria -witch -witchhunt -withdrawal -witness -wolf -woman -wombat -women -wood -woodland -woodshed -woodwind -wool -woolen -word -work -workbench -worker -workhorse -worklife -workshop -world -worm -worthy -wound -wrap -wraparound -wrecker -wren -wrench -wrestler -wrinkle -wrist -writer -writing -wrong -xylophone -yacht -yak -yam -yard -yarmulke -yarn -yawl -year -yellow -yesterday -yew -yin -yogurt -yoke -young -youth -yurt -zampone -zebra -zebrafish -zephyr -ziggurat -zinc -zipper -zither -zone -zoo -zoologist -zoology -zootsuit -zucchini diff --git a/iso/installer/install.sh b/iso/installer/install.sh index e302a047..91de24fe 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -337,7 +337,7 @@ npm install https://github.com/t3chn0m4g3/elasticsearch-dump -g 2>&1 | dialog -- wget https://github.com/bcicen/ctop/releases/download/v0.6.1/ctop-0.6.1-linux-amd64 -O ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF mv ctop /usr/bin/ 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF chmod +x /usr/bin/ctop 2>&1 | dialog --title "[ Installing ctop ]" $myPROGRESSBOXCONF -git clone https://github.com/dtag-dev-sec/tpotce -b 17.06 /opt/tpot 2>&1 | dialog --title "[ Cloning T-Pot ]" $myPROGRESSBOXCONF +git clone https://github.com/dtag-dev-sec/tpotce /opt/tpot 2>&1 | dialog --title "[ Cloning T-Pot ]" $myPROGRESSBOXCONF # Let's add a new user addgroup --gid 2000 tpot 2>&1 | dialog --title "[ Adding new user ]" $myPROGRESSBOXCONF diff --git a/iso/isolinux/txt.cfg b/iso/isolinux/txt.cfg index e93d49f7..0c87c077 100755 --- a/iso/isolinux/txt.cfg +++ b/iso/isolinux/txt.cfg @@ -1,6 +1,6 @@ default install label install - menu label ^T-Pot 17.10 (Alpha) + menu label ^T-Pot 17.10 (Beta) menu default kernel linux append vga=788 initrd=initrd.gz console-setup/ask_detect=true -- diff --git a/update.sh b/update.sh index d06fb014..c2ab370f 100755 --- a/update.sh +++ b/update.sh @@ -24,7 +24,7 @@ fi function fuCONFIGCHECK () { echo "### Checking for T-Pot configuration file ..." echo -n "###### $myBLUE$myCONFIGFILE$myWHITE " - if ! [ -f $myCONFIGFILE ]; + if ! [ -f $myCONFIGFILE ]; then echo echo $myRED"Error - No T-Pot configuration file present." @@ -66,7 +66,7 @@ function fuSELFUPDATE () { echo "###### $myBLUE"No updates found in repository."$myWHITE" return fi - myRESULT=$(git diff --name-only origin/17.06 | grep update.sh) + myRESULT=$(git diff --name-only origin/master | grep update.sh) myLOCALSTAT=$(git status -uno | grep -c update.sh) if [ "$myRESULT" == "update.sh" ]; then @@ -85,14 +85,14 @@ function fuSELFUPDATE () { else echo "###### Update script is already up-to-date." git pull --force - fi -} + fi +} # Only run with command switch if [ "$1" != "-y" ]; then - echo "This script will update / upgrade all T-Pot related scripts, tools and packages" + echo "This script will update / upgrade all T-Pot related scripts, tools and packages" echo "Some of your changes might be overwritten, so make sure to save your work" - echo "This feature is still experimental, run with \"-y\" switch" + echo "This feature is still experimental, run with \"-y\" switch" echo exit fi