Manual merge of the ChangeSet to remove the dependency on manual.texi from the...

Manual merge of the ChangeSet to remove the dependency on manual.texi from the source tree (from 4.0)


BitKeeper/deleted/.del-afghanistan.gif~bd934d946f3bdd59:
  Auto merged
BitKeeper/deleted/.del-albania.gif~920c18c5f3bd94f5:
  Auto merged
BitKeeper/deleted/.del-algeria.gif~70038752bd872102:
  Auto merged
BitKeeper/deleted/.del-andorra.gif~400c9517f5a7268f:
  Auto merged
BitKeeper/deleted/.del-angola.gif~b366af754ac52de3:
  Auto merged
BitKeeper/deleted/.del-antartica.gif~1a34b3a7409d5bf2:
  Auto merged
BitKeeper/deleted/.del-antigua-and-barbuda.gif~471679e823427c3d:
  Auto merged
BitKeeper/deleted/.del-argentina.eps~79d033cbfba0697a:
  Auto merged
BitKeeper/deleted/.del-argentina.gif~1818b07e221227:
  Auto merged
BitKeeper/deleted/.del-argentina.gif~4fc28afb8cb08692:
  Auto merged
BitKeeper/deleted/.del-argentina.pdf~83fcf14b727ae306:
  Auto merged
BitKeeper/deleted/.del-argentina.txt~75de5b063d1a1560:
  Auto merged
BitKeeper/deleted/.del-armenia.eps~643f5c261ebab928:
  Auto merged
BitKeeper/deleted/.del-armenia.gif~38bb7a3d6a564ecc:
  Auto merged
BitKeeper/deleted/.del-armenia.gif~d812f4ac738f93b5:
  Auto merged
BitKeeper/deleted/.del-armenia.txt~9b07e8896669b144:
  Auto merged
BitKeeper/deleted/.del-australia.eps~c3f5a8e36f6a6772:
  Auto merged
BitKeeper/deleted/.del-australia.gif~56f9808ee943fac:
  Auto merged
BitKeeper/deleted/.del-australia.gif~c6d8db20d5bdb80c:
  Auto merged
BitKeeper/deleted/.del-australia.pdf~e7a39134644c310c:
  Auto merged
BitKeeper/deleted/.del-australia.txt~88eae38ad0a29a9b:
  Auto merged
BitKeeper/deleted/.del-austria.eps~8e6934b528c7ba65:
  Auto merged
BitKeeper/deleted/.del-austria.gif~4b528a1b567629c1:
  Auto merged
BitKeeper/deleted/.del-austria.gif~eda4c0df508b2796:
  Auto merged
BitKeeper/deleted/.del-austria.pdf~88115eca98801ee1:
  Auto merged
BitKeeper/deleted/.del-austria.txt~eabda07c94bc3783:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-azerbaijan.gif~98176e76cf690118:
  Auto merged
BitKeeper/deleted/.del-bahamas.gif~55a7fa36a5710a19:
  Auto merged
BitKeeper/deleted/.del-bahrein.gif~fb4f1be9efcd652a:
  Auto merged
BitKeeper/deleted/.del-bangladesh.gif~a26e3ed0f95fe8b:
  Auto merged
BitKeeper/deleted/.del-barbados.gif~2c0e969f87b19e31:
  Auto merged
BitKeeper/deleted/.del-belarus.gif~e8b45aa5f1ca2b6d:
  Auto merged
BitKeeper/deleted/.del-belgium.eps~10f1218e783cadb5:
  Auto merged
BitKeeper/deleted/.del-belgium.gif~47e115c2f692a300:
  Auto merged
BitKeeper/deleted/.del-belgium.gif~a94aacc01a1443af:
  Auto merged
BitKeeper/deleted/.del-belgium.pdf~d66d1f4d161dbfa7:
  Auto merged
BitKeeper/deleted/.del-belgium.txt~1cc4ae60f07ea525:
  Auto merged
BitKeeper/deleted/.del-belize.gif~e1910cdc1a2aaf4a:
  Auto merged
BitKeeper/deleted/.del-benin.gif~e55efbc654304fc2:
  Auto merged
BitKeeper/deleted/.del-bermuda.gif~60ea5c297a759644:
  Auto merged
BitKeeper/deleted/.del-bhutan.gif~895593de8b75b3d7:
  Auto merged
BitKeeper/deleted/.del-bolivia.gif~7fbd5d698e19a7:
  Auto merged
BitKeeper/deleted/.del-bosnia-and-herzegovina.gif~4bfbcc12c26a97ed:
  Auto merged
BitKeeper/deleted/.del-botswana.gif~ada926c097ae7484:
  Auto merged
BitKeeper/deleted/.del-brazil.eps~d11dc8c39b1b52ed:
  Auto merged
BitKeeper/deleted/.del-brazil.gif~1cc3967b6293833b:
  Auto merged
BitKeeper/deleted/.del-brazil.gif~43080d754a1f66c3:
  Auto merged
BitKeeper/deleted/.del-brazil.txt~82fed449c34f3150:
  Auto merged
BitKeeper/deleted/.del-brunei.gif~9d74fa8a8655bb8e:
  Auto merged
BitKeeper/deleted/.del-bulgaria.eps~58ae212ad442ecb7:
  Auto merged
BitKeeper/deleted/.del-bulgaria.gif~829eaaa78ea00bc4:
  Auto merged
BitKeeper/deleted/.del-bulgaria.gif~859289ca21a394b:
  Auto merged
BitKeeper/deleted/.del-bulgaria.pdf~fdcd6f1b96d36f5b:
  Auto merged
BitKeeper/deleted/.del-bulgaria.txt~8d3854c355db697e:
  Auto merged
BitKeeper/deleted/.del-burkina-faso.gif~f17ab1a7b4726205:
  Auto merged
BitKeeper/deleted/.del-burma.gif~ab554009f470a00b:
  Auto merged
BitKeeper/deleted/.del-burundi.gif~77e447f736b5b8fe:
  Auto merged
BitKeeper/deleted/.del-cambodia.gif~390be7f98e98ef0f:
  Auto merged
BitKeeper/deleted/.del-cameroon.gif~e144fca71e8fc244:
  Auto merged
BitKeeper/deleted/.del-canada.eps~870d51433272b91e:
  Auto merged
BitKeeper/deleted/.del-canada.gif~2b36f4f336fcbdd7:
  Auto merged
BitKeeper/deleted/.del-canada.gif~e75e7e744dba396c:
  Auto merged
BitKeeper/deleted/.del-canada.pdf~7aa6ddfa4274a503:
  Auto merged
BitKeeper/deleted/.del-canada.txt~c877dedbb6500f48:
  Auto merged
BitKeeper/deleted/.del-cape-verde.gif~152189bcc5c245a2:
  Auto merged
BitKeeper/deleted/.del-central-african-republic.gif~c0bf932afe983895:
  Auto merged
BitKeeper/deleted/.del-chad.gif~e6657243d593d2be:
  Auto merged
BitKeeper/deleted/.del-chile.eps~6b4470792773d5f9:
  Auto merged
BitKeeper/deleted/.del-chile.gif~5f7700a1414fba60:
  Auto merged
BitKeeper/deleted/.del-chile.gif~9e2cb4d54d82d046:
  Auto merged
BitKeeper/deleted/.del-chile.pdf~3ccf0b62c48e0eb8:
  Auto merged
BitKeeper/deleted/.del-chile.txt~c143167238e9db34:
  Auto merged
BitKeeper/deleted/.del-china.eps~e27e42602de3ded7:
  Auto merged
BitKeeper/deleted/.del-china.gif~a6df3c22685c50fd:
  Auto merged
BitKeeper/deleted/.del-china.gif~f2aa06d0635b653f:
  Auto merged
BitKeeper/deleted/.del-china.pdf~b3524c4313aeb4f4:
  Auto merged
BitKeeper/deleted/.del-china.txt~f2c436ae8409252:
  Auto merged
BitKeeper/deleted/.del-colombia.gif~e0eaca8dffd0e137:
  Auto merged
BitKeeper/deleted/.del-comoros.gif~a045ba2590ad8204:
  Auto merged
BitKeeper/deleted/.del-congo.gif~7737656d9939a718:
  Auto merged
BitKeeper/deleted/.del-costa-rica.eps~3999b27ab2e876c5:
  Auto merged
BitKeeper/deleted/.del-costa-rica.gif~e4f609b46043b612:
  Auto merged
BitKeeper/deleted/.del-costa-rica.gif~f10605fdf2aea8a:
  Auto merged
BitKeeper/deleted/.del-costa-rica.pdf~ad1185a29a583cff:
  Auto merged
BitKeeper/deleted/.del-costa-rica.txt~fc47cc5846cde0c1:
  Auto merged
BitKeeper/deleted/.del-cote-d-ivoire.gif~9adcb3eb5599012e:
  Auto merged
BitKeeper/deleted/.del-croatia.eps~621866ebf8db9526:
  Auto merged
BitKeeper/deleted/.del-croatia.gif~7b7a7e5c76dbc1:
  Auto merged
BitKeeper/deleted/.del-croatia.gif~d48555c97fa6e7b0:
  Auto merged
BitKeeper/deleted/.del-croatia.txt~55d9c2aaec850113:
  Auto merged
BitKeeper/deleted/.del-cuba.gif~16838c96e8195f08:
  Auto merged
BitKeeper/deleted/.del-cyprus.gif~fecfaf77f8153607:
  Auto merged
BitKeeper/deleted/.del-czech-republic.eps~3a16711ce569e4f7:
  Auto merged
BitKeeper/deleted/.del-czech-republic.gif~12957b374194bb89:
  Auto merged
BitKeeper/deleted/.del-czech-republic.gif~3cdfb4447c89fb7a:
  Auto merged
BitKeeper/deleted/.del-czech-republic.pdf~6185b7b29cf21c20:
  Auto merged
BitKeeper/deleted/.del-czech-republic.txt~f35c3417f35bb917:
  Auto merged
BitKeeper/deleted/.del-denmark-original-incorrect.gif~5d85710fb55de2c2:
  Auto merged
BitKeeper/deleted/.del-denmark.eps~67c559554779943c:
  Auto merged
BitKeeper/deleted/.del-denmark.gif~56d1cc99f435d046:
  Auto merged
BitKeeper/deleted/.del-denmark.gif~794733445761c7d9:
  Auto merged
BitKeeper/deleted/.del-denmark.pdf~772f1f647f6675b4:
  Auto merged
BitKeeper/deleted/.del-denmark.txt~9467854a287a11d3:
  Auto merged
BitKeeper/deleted/.del-djibouti.gif~3a11d87bfdc7ca6a:
  Auto merged
BitKeeper/deleted/.del-dominica.gif~91c8fddd58385d66:
  Auto merged
BitKeeper/deleted/.del-dominican-republic.gif~a05fa19ee59566f:
  Auto merged
BitKeeper/deleted/.del-ecuador.gif~da0b80de595301f5:
  Auto merged
BitKeeper/deleted/.del-egypt.gif~1abbeb9541c45762:
  Auto merged
BitKeeper/deleted/.del-el-salvador.gif~87bfdc4a1b16ca67:
  Auto merged
BitKeeper/deleted/.del-equatorial-guinea.gif~e3d315d4eaf28a41:
  Auto merged
BitKeeper/deleted/.del-eritrea.gif~d27f5468ecf168a:
  Auto merged
BitKeeper/deleted/.del-estonia.eps~476ee9951ed567a6:
  Auto merged
BitKeeper/deleted/.del-estonia.gif~95d6213246c5d512:
  Auto merged
BitKeeper/deleted/.del-estonia.gif~d5dbe214eadc22f9:
  Auto merged
BitKeeper/deleted/.del-estonia.pdf~152b980e58ddfe95:
  Auto merged
BitKeeper/deleted/.del-estonia.txt~fbabf17caf23c74:
  Auto merged
BitKeeper/deleted/.del-ethiopia.gif~67458ef685bd46ca:
  Auto merged
BitKeeper/deleted/.del-fiji.gif~3a082d54c888db61:
  Auto merged
BitKeeper/deleted/.del-finland.eps~ababe64096bc701e:
  Auto merged
BitKeeper/deleted/.del-finland.gif~31a9c03ceac484df:
  Auto merged
BitKeeper/deleted/.del-finland.gif~3856b7c47a822250:
  Auto merged
BitKeeper/deleted/.del-finland.pdf~aab3e414da9754ab:
  Auto merged
BitKeeper/deleted/.del-finland.txt~de31f3046646f95:
  Auto merged
BitKeeper/deleted/.del-france.eps~54769290ec25c3f8:
  Auto merged
BitKeeper/deleted/.del-france.gif~31e0b62070c6d14f:
  Auto merged
BitKeeper/deleted/.del-france.gif~64aa78ca3e77be37:
  Auto merged
BitKeeper/deleted/.del-france.pdf~2f143b49353abb46:
  Auto merged
BitKeeper/deleted/.del-france.txt~fe93e7e98b8daec0:
  Auto merged
BitKeeper/deleted/.del-gabon.gif~5e5c7c8dc0902328:
  Auto merged
BitKeeper/deleted/.del-gambia.gif~8525f1597465137d:
  Auto merged
BitKeeper/deleted/.del-georgia.gif~3a9c93fa982b8c06:
  Auto merged
BitKeeper/deleted/.del-germany.eps~8ec02ead1a75bbfb:
  Auto merged
BitKeeper/deleted/.del-germany.gif~7c2750867600a157:
  Auto merged
BitKeeper/deleted/.del-germany.gif~97dfeb0eb82cac6d:
  Auto merged
BitKeeper/deleted/.del-germany.pdf~aca678db2fc30f2f:
  Auto merged
BitKeeper/deleted/.del-germany.txt~d73791b0314d5343:
  Auto merged
BitKeeper/deleted/.del-ghana.gif~9d71585fa3b223c0:
  Auto merged
BitKeeper/deleted/.del-great-britain.eps~69bd9bdc60b3b71b:
  Auto merged
BitKeeper/deleted/.del-great-britain.gif~94507aceb6ea0298:
  Auto merged
BitKeeper/deleted/.del-great-britain.gif~d4ec21a021252ce5:
  Auto merged
BitKeeper/deleted/.del-great-britain.pdf~b425328dc4073027:
  Auto merged
BitKeeper/deleted/.del-great-britain.txt~c1362455ef389db2:
  Auto merged
BitKeeper/deleted/.del-greece.eps~30dd253c6047f42f:
  Auto merged
BitKeeper/deleted/.del-greece.gif~c8fbf8252cc56212:
  Auto merged
BitKeeper/deleted/.del-greece.gif~d2a46be5950e4784:
  Auto merged
BitKeeper/deleted/.del-greece.pdf~e61ed027c4d629:
  Auto merged
BitKeeper/deleted/.del-greece.txt~5c5b5ddbb62811c9:
  Auto merged
BitKeeper/deleted/.del-greenland.gif~44310f9e9180e0b:
  Auto merged
BitKeeper/deleted/.del-grenada.gif~db9d209340558224:
  Auto merged
BitKeeper/deleted/.del-guatemala.gif~4d43cb1c1dbeddc7:
  Auto merged
BitKeeper/deleted/.del-guinea-bissau.gif~dc000cb5bd0eb40e:
  Auto merged
BitKeeper/deleted/.del-guinea.gif~89df2e995fbc90d1:
  Auto merged
BitKeeper/deleted/.del-guyana.gif~3eca6d667b6fcb36:
  Auto merged
BitKeeper/deleted/.del-haiti.gif~5831a1b51a9b0d3d:
  Auto merged
BitKeeper/deleted/.del-honduras.gif~f0715e39e5b80529:
  Auto merged
BitKeeper/deleted/.del-hungary.eps~a7d682f15e7be0ea:
  Auto merged
BitKeeper/deleted/.del-hungary.gif~373325ba9bcbdc72:
  Auto merged
BitKeeper/deleted/.del-hungary.gif~74e09a15557c20e4:
  Auto merged
BitKeeper/deleted/.del-hungary.pdf~918baeb6bf07fa97:
  Auto merged
BitKeeper/deleted/.del-hungary.txt~c65c28ecc13cee38:
  Auto merged
BitKeeper/deleted/.del-iceland.eps~9cc02c4e666e803:
  Auto merged
BitKeeper/deleted/.del-iceland.gif~902645739e3c6b75:
  Auto merged
BitKeeper/deleted/.del-iceland.gif~aa7253cb1838978e:
  Auto merged
BitKeeper/deleted/.del-iceland.pdf~da00f08b9f794a92:
  Auto merged
BitKeeper/deleted/.del-iceland.txt~dd6b3c03d0e35936:
  Auto merged
BitKeeper/deleted/.del-india.gif~c93c8f6fff86f765:
  Auto merged
BitKeeper/deleted/.del-indonesia.eps~ca7ee0a66154d34d:
  Auto merged
BitKeeper/deleted/.del-indonesia.gif~2137016b86bc5d07:
  Auto merged
BitKeeper/deleted/.del-indonesia.gif~a096242096a7c7a:
  Auto merged
BitKeeper/deleted/.del-indonesia.pdf~f14b2f53c85a43d:
  Auto merged
BitKeeper/deleted/.del-indonesia.txt~cae5c380959a5460:
  Auto merged
BitKeeper/deleted/.del-iran.gif~2cb4e9c4657b5b33:
  Auto merged
BitKeeper/deleted/.del-iraq.gif~a1646e6d65515d76:
  Auto merged
BitKeeper/deleted/.del-ireland.eps~9c52bfd977d47d1a:
  Auto merged
BitKeeper/deleted/.del-ireland.gif~3a5ffafd74c67fe:
  Auto merged
BitKeeper/deleted/.del-ireland.gif~5e4633333643bee2:
  Auto merged
BitKeeper/deleted/.del-ireland.pdf~e459dd3a1de0f8c7:
  Auto merged
BitKeeper/deleted/.del-ireland.txt~c8a9f56f150f1008:
  Auto merged
BitKeeper/deleted/.del-israel.eps~43ecb6f31dcfe2f3:
  Auto merged
BitKeeper/deleted/.del-israel.gif~60af491676720a39:
  Auto merged
BitKeeper/deleted/.del-israel.gif~f503ea92490b42da:
  Auto merged
BitKeeper/deleted/.del-israel.txt~4430c078ea12b98e:
  Auto merged
BitKeeper/deleted/.del-italy.eps~4c8a4d9f1e6fe897:
  Auto merged
BitKeeper/deleted/.del-italy.gif~43074800bb72a037:
  Auto merged
BitKeeper/deleted/.del-italy.gif~c1d1d4c51841d831:
  Auto merged
BitKeeper/deleted/.del-italy.pdf~ae8671649b09cb96:
  Auto merged
BitKeeper/deleted/.del-italy.txt~428bb945a2576671:
  Auto merged
BitKeeper/deleted/.del-jamaica.gif~48999b84247ad492:
  Auto merged
BitKeeper/deleted/.del-japan.eps~fe89aea87d627e85:
  Auto merged
BitKeeper/deleted/.del-japan.gif~1c6f45454aa378b3:
  Auto merged
BitKeeper/deleted/.del-japan.gif~4c6a663ab9a32af2:
  Auto merged
BitKeeper/deleted/.del-japan.pdf~40532606f6053145:
  Auto merged
BitKeeper/deleted/.del-japan.txt~114edadc3ac11a71:
  Auto merged
BitKeeper/deleted/.del-jordan.gif~4381349560430e61:
  Auto merged
BitKeeper/deleted/.del-kazakhstan.gif~9bbe9c6ac8b42277:
  Auto merged
BitKeeper/deleted/.del-kenya.gif~d170c4f48b6635d3:
  Auto merged
BitKeeper/deleted/.del-kiribati.gif~7f5bc99e8b7a6db:
  Auto merged
BitKeeper/deleted/.del-kuwait.gif~2d03e81edda025d0:
  Auto merged
BitKeeper/deleted/.del-kyrgyzstan.gif~6cbe9f09a93ea9e0:
  Auto merged
BitKeeper/deleted/.del-laos.gif~f686f38cbff73598:
  Auto merged
BitKeeper/deleted/.del-latvia.eps~6a6307d66a0cb07:
  Auto merged
BitKeeper/deleted/.del-latvia.gif~2d1469d626431b5a:
  Auto merged
BitKeeper/deleted/.del-latvia.gif~abbe57eb4438c6e8:
  Auto merged
BitKeeper/deleted/.del-latvia.pdf~25516993d39fa760:
  Auto merged
BitKeeper/deleted/.del-latvia.txt~193a3991e0eddaf9:
  Auto merged
BitKeeper/deleted/.del-lebanon.gif~2d27883e8fe0c647:
  Auto merged
BitKeeper/deleted/.del-lesotho.gif~c42ad927ffe83db7:
  Auto merged
BitKeeper/deleted/.del-liberia.gif~1dd584598bfe881b:
  Auto merged
BitKeeper/deleted/.del-libya.gif~98259878434e0df2:
  Auto merged
BitKeeper/deleted/.del-liechtenstein.gif~8d068c686c4c6e8:
  Auto merged
BitKeeper/deleted/.del-lithuania.gif~88cec9a9fe920632:
  Auto merged
BitKeeper/deleted/.del-luxembourg.gif~7e4660faa840e7:
  Auto merged
BitKeeper/deleted/.del-macedonia.gif~bce0e1455919f41b:
  Auto merged
BitKeeper/deleted/.del-madagascar.gif~e95bd0c2aabb8ab8:
  Auto merged
BitKeeper/deleted/.del-malawi.gif~329ccd19b35bd1e2:
  Auto merged
BitKeeper/deleted/.del-malaysia.gif~6f7c73227da2ed6:
  Auto merged
BitKeeper/deleted/.del-maldives.gif~941bf5a2381b904c:
  Auto merged
BitKeeper/deleted/.del-mali.gif~845a23a66aaaef5:
  Auto merged
BitKeeper/deleted/.del-malta.gif~d0d470d7dbb963ea:
  Auto merged
BitKeeper/deleted/.del-manual.ja.texi~bdf63728a7b03acf:
  Auto merged
BitKeeper/deleted/.del-manual.texi~af95f3e233925495:
  Auto merged
BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41:
  Auto merged
BitKeeper/deleted/.del-marshall.gif~38fc2b1073ceb166:
  Auto merged
BitKeeper/deleted/.del-mauritania.gif~b6d97b5076bb603a:
  Auto merged
BitKeeper/deleted/.del-mauritius.gif~498d6d0e323d7ef9:
  Auto merged
BitKeeper/deleted/.del-mexico.eps~9186bd67f1a25a3f:
  Auto merged
BitKeeper/deleted/.del-mexico.gif~8effa1ca4d73071e:
  Auto merged
BitKeeper/deleted/.del-mexico.gif~a749e257ffeb6588:
  Auto merged
BitKeeper/deleted/.del-mexico.pdf~a0b20871c2e61325:
  Auto merged
BitKeeper/deleted/.del-mexico.txt~a776cf3478c85e68:
  Auto merged
BitKeeper/deleted/.del-micronesia.gif~c46715026d7efe8e:
  Auto merged
BitKeeper/deleted/.del-moldova.gif~34a9fa58f5674048:
  Auto merged
BitKeeper/deleted/.del-monaco.gif~d2a99ae34527d133:
  Auto merged
BitKeeper/deleted/.del-mongolia.gif~41633d1ced991c78:
  Auto merged
BitKeeper/deleted/.del-morocco.gif~45858306e12988e9:
  Auto merged
BitKeeper/deleted/.del-mozambique.gif~41991b5a9df37691:
  Auto merged
BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d:
  Auto merged
BitKeeper/deleted/.del-namibia.gif~f3b3b2c233c9031f:
  Auto merged
BitKeeper/deleted/.del-nauru.gif~1e08a1188c8ba0a5:
  Auto merged
BitKeeper/deleted/.del-nepal.gif~ae565b396d09e9db:
  Auto merged
BitKeeper/deleted/.del-netherlands.eps~2012cff48c4d9368:
  Auto merged
BitKeeper/deleted/.del-netherlands.gif~a1bee178928be339:
  Auto merged
BitKeeper/deleted/.del-netherlands.gif~d788dc4e9afd2f8a:
  Auto merged
BitKeeper/deleted/.del-netherlands.pdf~4833162b30912e1:
  Auto merged
BitKeeper/deleted/.del-netherlands.txt~214c2cbb9ac7db0a:
  Auto merged
BitKeeper/deleted/.del-new-zealand.eps~861b5316178fcb08:
  Auto merged
BitKeeper/deleted/.del-new-zealand.gif~1fbc54ab63225de7:
  Auto merged
BitKeeper/deleted/.del-new-zealand.gif~77ea426c11bb3ab:
  Auto merged
BitKeeper/deleted/.del-new-zealand.pdf~ceb107c0ae812a14:
  Auto merged
BitKeeper/deleted/.del-new-zealand.txt~f52fdd9690b63ac0:
  Auto merged
BitKeeper/deleted/.del-nicaragua.gif~37b8f7764ac4aea:
  Auto merged
BitKeeper/deleted/.del-niger.gif~c26adaadb8150cee:
  Auto merged
BitKeeper/deleted/.del-nigeria.gif~f157c385bd632a48:
  Auto merged
BitKeeper/deleted/.del-north-korea.gif~770fd51d9360ae18:
  Auto merged
BitKeeper/deleted/.del-norway.eps~b37c98d87edd8de:
  Auto merged
BitKeeper/deleted/.del-norway.gif~1d881d2af6c4e413:
  Auto merged
BitKeeper/deleted/.del-norway.gif~752c4b4d29375874:
  Auto merged
BitKeeper/deleted/.del-norway.pdf~980b935627182fb9:
  Auto merged
BitKeeper/deleted/.del-norway.txt~2844906ae717ea7a:
  Auto merged
BitKeeper/deleted/.del-oman.gif~3a84654e80950b30:
  Auto merged
BitKeeper/deleted/.del-pakistan.gif~5ef5cc6b162666b8:
  Auto merged
BitKeeper/deleted/.del-panama.gif~99595dd051a094f:
  Auto merged
BitKeeper/deleted/.del-papua-new-guinea.gif~884e9e27b55e51b9:
  Auto merged
BitKeeper/deleted/.del-paraguay.gif~e7b5dd73d7727a1d:
  Auto merged
BitKeeper/deleted/.del-peru.gif~323d2810b25bcab3:
  Auto merged
BitKeeper/deleted/.del-philippines.eps~64beb8e0853db8b2:
  Auto merged
BitKeeper/deleted/.del-philippines.gif~6cf82c24f6baef53:
  Auto merged
BitKeeper/deleted/.del-philippines.gif~c80b5315738462af:
  Auto merged
BitKeeper/deleted/.del-philippines.pdf~b7977a895a0f6a76:
  Auto merged
BitKeeper/deleted/.del-philippines.txt~f42e0270d8e22325:
  Auto merged
BitKeeper/deleted/.del-poland.eps~8be27a5447e3a146:
  Auto merged
BitKeeper/deleted/.del-poland.gif~9d9673f2ea9d5129:
  Auto merged
BitKeeper/deleted/.del-poland.gif~bcbc9ed9b75fcd3c:
  Auto merged
BitKeeper/deleted/.del-poland.pdf~e71f4eaa53f33cd:
  Auto merged
BitKeeper/deleted/.del-poland.txt~e484ca6c9feb9080:
  Auto merged
BitKeeper/deleted/.del-portugal.eps~98b9150ce6a649b8:
  Auto merged
BitKeeper/deleted/.del-portugal.gif~b6ec9ce2c88220f6:
  Auto merged
BitKeeper/deleted/.del-portugal.gif~c7cc13bb1c6dfe9d:
  Auto merged
BitKeeper/deleted/.del-portugal.pdf~24587f586bc7534b:
  Auto merged
BitKeeper/deleted/.del-portugal.txt~b3286118e0bfcc3:
  Auto merged
BitKeeper/deleted/.del-qatar.gif~9fb4afe3352b17:
  Auto merged
BitKeeper/deleted/.del-romania.eps~d197860bb0edbd64:
  Auto merged
BitKeeper/deleted/.del-romania.gif~325d2f16f9f78167:
  Auto merged
BitKeeper/deleted/.del-romania.gif~8c5ad831482c31e3:
  Auto merged
BitKeeper/deleted/.del-romania.pdf~322c2e57ce6ceed:
  Auto merged
BitKeeper/deleted/.del-romania.txt~c716fe6568110738:
  Auto merged
BitKeeper/deleted/.del-russia.eps~653c84cd2a80b954:
  Auto merged
BitKeeper/deleted/.del-russia.gif~300890a87b30d01e:
  Auto merged
BitKeeper/deleted/.del-russia.gif~403a87b38ae5c91f:
  Auto merged
BitKeeper/deleted/.del-russia.pdf~7fe386a4e48f013:
  Auto merged
BitKeeper/deleted/.del-russia.txt~91dea186f11d7fdc:
  Auto merged
BitKeeper/deleted/.del-rwanda.gif~ba3a28fb5edc29f5:
  Auto merged
BitKeeper/deleted/.del-saint-kitts-and-nevis.gif~485d911ee10ee2da:
  Auto merged
BitKeeper/deleted/.del-saint-lucia.gif~a43f5b43c241e500:
  Auto merged
BitKeeper/deleted/.del-samoa.gif~7f7fab6fab145abb:
  Auto merged
BitKeeper/deleted/.del-sao-tome-and-principe.gif~94b3095157b80615:
  Auto merged
BitKeeper/deleted/.del-saudi-arabia.gif~af90b0627e4ae9d8:
  Auto merged
BitKeeper/deleted/.del-section.Infolinks.texi~c237f2f9:
  Auto merged
BitKeeper/deleted/.del-section.Testimonials.texi~418f3f63:
  Auto merged
BitKeeper/deleted/.del-section.Users.texi~41da5f4c:
  Auto merged
BitKeeper/deleted/.del-senegal.gif~944633605d3a29ff:
  Auto merged
BitKeeper/deleted/.del-seychelles.gif~f0b489c8e84fef71:
  Auto merged
BitKeeper/deleted/.del-sierra-leone.gif~5c446a27d7e98d59:
  Auto merged
BitKeeper/deleted/.del-singapore.eps~1efd8578def570d8:
  Auto merged
BitKeeper/deleted/.del-singapore.gif~78f227e1f0129a:
  Auto merged
BitKeeper/deleted/.del-singapore.gif~e18bf77765b76d2f:
  Auto merged
BitKeeper/deleted/.del-singapore.pdf~77019ac12b0d44b0:
  Auto merged
BitKeeper/deleted/.del-singapore.txt~21978a833ace2d2:
  Auto merged
BitKeeper/deleted/.del-slovakia.gif~c3d054b17f9c8997:
  Auto merged
BitKeeper/deleted/.del-slovenia.eps~f73ea56aafc02828:
  Auto merged
BitKeeper/deleted/.del-slovenia.gif~353783f82c89c7c8:
  Auto merged
BitKeeper/deleted/.del-slovenia.gif~405038776bc7f2a1:
  Auto merged
BitKeeper/deleted/.del-slovenia.pdf~349905c733fcc8a:
  Auto merged
BitKeeper/deleted/.del-slovenia.txt~21996e7d83808d0f:
  Auto merged
BitKeeper/deleted/.del-solomon-islands.gif~b4de58f666ff31c7:
  Auto merged
BitKeeper/deleted/.del-somalia.gif~7c09bce9340f39ca:
  Auto merged
BitKeeper/deleted/.del-south-africa.eps~4f647997f3f26988:
  Auto merged
BitKeeper/deleted/.del-south-africa.gif~2aaea35c3bdd90b6:
  Auto merged
BitKeeper/deleted/.del-south-africa.gif~8ef88d69ba7c794:
  Auto merged
BitKeeper/deleted/.del-south-africa.pdf~ef7f63c8153ef8d5:
  Auto merged
BitKeeper/deleted/.del-south-africa.txt~4674c3b1a39d79c9:
  Auto merged
BitKeeper/deleted/.del-south-korea.eps~9c944ac52a247665:
  Auto merged
BitKeeper/deleted/.del-south-korea.gif~1311c2eada860e9d:
  Auto merged
BitKeeper/deleted/.del-south-korea.gif~f0fe17a9495664c9:
  Auto merged
BitKeeper/deleted/.del-south-korea.pdf~24496add674f1d6:
  Auto merged
BitKeeper/deleted/.del-south-korea.txt~93c9adabe5ac3339:
  Auto merged
BitKeeper/deleted/.del-spain.eps~a798dd1293a30b7c:
  Auto merged
BitKeeper/deleted/.del-spain.gif~345db1228c3a5477:
  Auto merged
BitKeeper/deleted/.del-spain.gif~7217c59c507d153c:
  Auto merged
BitKeeper/deleted/.del-spain.pdf~a25de45d2ded91ed:
  Auto merged
BitKeeper/deleted/.del-spain.txt~4b3da48f41bfa958:
  Auto merged
BitKeeper/deleted/.del-sri-lanka.gif~ef59edd8115e2afa:
  Auto merged
BitKeeper/deleted/.del-sudan.gif~6c5d2540c31b8c27:
  Auto merged
BitKeeper/deleted/.del-suriname.gif~54de84a4ef71a82:
  Auto merged
BitKeeper/deleted/.del-swaziland.gif~88decc065b4034b5:
  Auto merged
BitKeeper/deleted/.del-sweden.eps~4c24b952feb3ab:
  Auto merged
BitKeeper/deleted/.del-sweden.gif~8653c24f7bac88dc:
  Auto merged
BitKeeper/deleted/.del-sweden.gif~dc755f14f1dc3c49:
  Auto merged
BitKeeper/deleted/.del-sweden.pdf~4afd5afe76bd9172:
  Auto merged
BitKeeper/deleted/.del-sweden.txt~b6d9f06fa227065d:
  Auto merged
BitKeeper/deleted/.del-sweden2.gif~51ee64f83a448b5:
  Auto merged
BitKeeper/deleted/.del-switzerland.eps~7811f8473ff72b6e:
  Auto merged
BitKeeper/deleted/.del-switzerland.gif~37312e2f4537a7e3:
  Auto merged
BitKeeper/deleted/.del-switzerland.gif~dabb711999e3126d:
  Auto merged
BitKeeper/deleted/.del-switzerland.pdf~ec02533fefb5071d:
  Auto merged
BitKeeper/deleted/.del-switzerland.txt~e09c851d69c407a6:
  Auto merged
BitKeeper/deleted/.del-syria.gif~5a910d0a3a57701:
  Auto merged
BitKeeper/deleted/.del-taiwan.eps~cc2ecaf6122443f:
  Auto merged
BitKeeper/deleted/.del-taiwan.gif~295c56859e5f5e:
  Auto merged
BitKeeper/deleted/.del-taiwan.gif~b5f1796ed3c458e4:
  Auto merged
BitKeeper/deleted/.del-taiwan.pdf~5ff5a019d8237d3c:
  Auto merged
BitKeeper/deleted/.del-taiwan.txt~d0a19c41a1ed3861:
  Auto merged
BitKeeper/deleted/.del-tajikistan.gif~4e42abdd2be16ed8:
  Auto merged
BitKeeper/deleted/.del-tanzania.gif~3fbe0bc01bcc3247:
  Auto merged
BitKeeper/deleted/.del-texi2html~74632fe370dcec73:
  Auto merged
BitKeeper/deleted/.del-thailand.gif~263675b09165b835:
  Auto merged
BitKeeper/deleted/.del-togo.gif~485e7cec93f5410a:
  Auto merged
BitKeeper/deleted/.del-tonga.gif~87fef29eef8c57fd:
  Auto merged
BitKeeper/deleted/.del-trinidad-and-tobago.gif~dfa47192f1bc025:
  Auto merged
BitKeeper/deleted/.del-tunisia.gif~f7b1ad0569613f36:
  Auto merged
BitKeeper/deleted/.del-turkey.eps~6e9ebd6992e53d70:
  Auto merged
BitKeeper/deleted/.del-turkey.gif~b0bd57ef44dee47a:
  Auto merged
BitKeeper/deleted/.del-turkey.gif~cb55d42965e9f824:
  Auto merged
BitKeeper/deleted/.del-turkey.pdf~287742544b50b431:
  Auto merged
BitKeeper/deleted/.del-turkey.txt~bc65755bf8a2a21:
  Auto merged
BitKeeper/deleted/.del-turkmenistan.gif~7679a96df08d950a:
  Auto merged
BitKeeper/deleted/.del-tuvalu.gif~3f85331ac0890213:
  Auto merged
BitKeeper/deleted/.del-uganda.gif~45b3e3b539f02aee:
  Auto merged
BitKeeper/deleted/.del-ukraine.eps~f450a951bf5c4dc9:
  Auto merged
BitKeeper/deleted/.del-ukraine.gif~847cd0f7333e72ac:
  Auto merged
BitKeeper/deleted/.del-ukraine.gif~d167f4bf9179141d:
  Auto merged
BitKeeper/deleted/.del-ukraine.pdf~d3b480f6acf3b56a:
  Auto merged
BitKeeper/deleted/.del-ukraine.txt~e4c1066096a8b1b3:
  Auto merged
BitKeeper/deleted/.del-united-arab-emirates.gif~2a6d03565d6ae748:
  Auto merged
BitKeeper/deleted/.del-united-states-of-america.gif~3817309e55e1f332:
  Auto merged
BitKeeper/deleted/.del-uruguay.gif~17d468a8b3affba4:
  Auto merged
BitKeeper/deleted/.del-usa.eps~64e6c5fe46d1929d:
  Auto merged
BitKeeper/deleted/.del-usa.gif~278102a819343b97:
  Auto merged
BitKeeper/deleted/.del-usa.gif~7c94951adc03bf9a:
  Auto merged
BitKeeper/deleted/.del-usa.pdf~ed44efa3b0c6f6ed:
  Auto merged
BitKeeper/deleted/.del-usa.txt~2792ba8db79f0a39:
  Auto merged
BitKeeper/deleted/.del-uzbekistan.gif~ca70f72fc4bca763:
  Auto merged
BitKeeper/deleted/.del-vanuatu.gif~e66deb3569e8c9a1:
  Auto merged
BitKeeper/deleted/.del-venezuela.gif~8b00719028184b0d:
  Auto merged
BitKeeper/deleted/.del-vietnam.gif~b8a7befce71994b1:
  Auto merged
BitKeeper/deleted/.del-vincent-and-grenadines.gif~f5ab7e413d8f1d5:
  Auto merged
BitKeeper/deleted/.del-yemen.gif~f0d4b9daecbbab9:
  Auto merged
BitKeeper/deleted/.del-yugoslavia.eps~b9bab90d98a3de45:
  Auto merged
BitKeeper/deleted/.del-yugoslavia.gif~532010647f1c98f7:
  Auto merged
BitKeeper/deleted/.del-yugoslavia.gif~d58992747df26331:
  Auto merged
BitKeeper/deleted/.del-yugoslavia.pdf~978eeff094d4a57e:
  Auto merged
BitKeeper/deleted/.del-yugoslavia.txt~cd146d758c75e6ab:
  Auto merged
BitKeeper/deleted/.del-zaire.gif~52dbed02848edb31:
  Auto merged
BitKeeper/deleted/.del-zambia.gif~3b2580f7d11759ec:
  Auto merged
BitKeeper/deleted/.del-zimbabwe.gif~478cfbaa6f5b066a:
  Auto merged
Docs/Makefile.am:
  Manual merge
scripts/make_win_src_distribution.sh:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge

Docs/Images/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
-
-## Process this file with automake to create Makefile.in
-
-# This is a dummy file to satisfy the hierarchy of Makefiles.
-# When a release is built, the true Makefile will be copied 
-# together with the "real" files in this directory.
-
-EXTRA_DIST =		
-
-# Nothing to create in this dummy directory.
-all:
-	:
-
-# Nothing to cleanup in this dummy directory.
-clean:
-	:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%

Docs/Makefile.am

@@ -9,184 +9,17 @@
 # If you know how to fix any of this more elegantly please mail
 # docs@mysql.com
 
-TEXI2HTML_FLAGS =	-iso -number -acc
-DVIPS =			dvips
-MAKEINFO =		@MAKEINFO@
-TEXINFO_TEX =		Support/texinfo.tex
+noinst_SCRIPTS =	Support/generate-text-files.pl
 
-noinst_SCRIPTS =	Support/texi2html Support/generate-text-files.pl \
-			Support/generate-mirror-listing.pl
-info_TEXINFOS =		manual.texi
+EXTRA_DIST =		$(noinst_SCRIPTS) mysql.info INSTALL-BINARY
 
-targets =		manual.txt mysql.info manual.html
-
-BUILT_SOURCES =		$(targets) manual_toc.html include.texi
-EXTRA_DIST =		$(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
-			INSTALL-BINARY reservedwords.texi internals.texi
-
-SUBDIRS =		Images
-
-all:			$(targets) txt_files
+all:			txt_files
 
 txt_files:		../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
 
-CLEAN_FILES:		$(BUILD_SOURCES)
-	touch $(BUILD_SOURCES)
-
-# The PostScript and PDF version are so big that they are not included in the
-# standard distribution. It is available for download from the home page.  
-paper: manual_a4.ps manual_letter.ps  $(PDFMANUAL)
-
-#########################################################################
-
-# The Makefile contains the previous version so we can not use that
-include.texi:	../configure.in
-	echo "@c This file is autogenerated by the Makefile" > $@
-	echo -n "@set mysqlversion " >> $@
-	grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
-	 sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> $@
-	echo -n "@set defaultport " >> $@
-	grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
-	 sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> $@
-
-
-#
-# English Manual
-#
-
-# GNU Info
-mysql.info:	manual.texi include.texi
-	cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
-
-# Plain Text
-manual.txt:	manual.texi include.texi
-	cd $(srcdir) && \
-	$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
-
-# HTML, all in one file
-manual.html:	manual.texi include.texi $(srcdir)/Support/texi2html
-	cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
-manual_toc.html: manual.html
-
-# PDF, Portable Document Format
-manual.pdf: manual.texi
-	sed -e 's|@image{[^}]*} *||g' <$< >manual-tmp.texi
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	mv manual-tmp.pdf $@
-	rm -f manual-tmp.*
-	touch $@
-
-# XML, DocBook 4.0
-mysql.xml: manual.texi include.texi
-	$(MAKEINFO) --force --no-ifinfo --docbook $<
-	mv $@ mysql-tmp.xml
-	Support/docbook-fixup.pl <mysql-tmp.xml >$@
-	rm -f mysql-tmp.xml
-
-# Postscript, A4 Paper
-manual_a4.ps:	manual.texi include.texi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
-	$(DVIPS) -t a4 manual.dvi -o $@
-	touch $@
-
-# Postscript, US Letter Paper
-manual_letter.ps:	manual.texi include.texi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch $<
-	$(DVIPS) -t letter manual.dvi -o $@
-	touch $@
-
-
-#
-# German Manual
-#
-
-# GNU Info
-mysql.de.info:	manual.de.texi include.texi
-	cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
-
-# Plain Text
-manual.de.txt:	manual.de.texi include.texi
-	cd $(srcdir) && \
-	$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
-
-# HTML, all in one file
-manual.de.html:	manual.de.texi include.texi $(srcdir)/Support/texi2html
-	cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
-manual_toc.de.html: manual.html
-
-# PDF, Portable Document Format
-manual.de.pdf: manual.de.texi
-	sed -e 's|@image{[^}]*} *||g' <$< >manual-tmp.texi
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	mv manual-tmp.pdf $@
-	rm -f manual-tmp.*
-	touch $@
-
-# XML, DocBook 4.0
-mysql.de.xml: manual.de.texi include.texi
-	$(MAKEINFO) --force --no-ifinfo --docbook $<
-	mv $@ mysql-tmp.xml
-	Support/docbook-fixup.pl <mysql-tmp.xml >$@
-	rm -f mysql-tmp.xml
-
-# Postscript, A4 Paper
-manual_a4.de.ps:	manual.de.texi include.texi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
-	$(DVIPS) -t a4 manual.de.dvi -o $@
-	touch $@
-
-# Postscript, US Letter Paper
-manual_letter.de.ps:	manual.de.texi include.texi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch $<
-	$(DVIPS) -t letter manual.de.dvi -o $@
-	touch $@
-
-#
-# Miscellaneous
-#
-
-# Target to produce NuSphere Manual
-nusphere.pdf: manual.texi
-	sed -e 's/@example/@smallexample/g' \
-	    -e 's/@end example/@end smallexample/g' \
-	    -e 's/@c ifnusphere //g' \
-	    -e 's|@image{[^}]*} *||g' \
-	<$< >manual-tmp.texi
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	mv manual-tmp.pdf $@
-	rm -f manual-tmp.*
-	touch $@
-
-# Include images for the manual in the distribution
-dist-hook:
-	BD=`cd $(top_srcdir); pwd`; \
-	echo "PostScript and PDF versions suitable for printing" \
-		> $(distdir)/manual.ps
-	echo "are available from http://dev.mysql.com/doc/" \
-		>> $(distdir)/manual.ps
-	echo "or any mirror site" \
-		>> $(distdir)/manual.ps
+CLEAN_FILES:		$(txt_files)
+	touch $(txt_files)
 
 GT = $(srcdir)/Support/generate-text-files.pl
 
@@ -202,9 +35,6 @@ GT = $(srcdir)/Support/generate-text-files.pl
 INSTALL-BINARY:	mysql.info $(GT)
 	perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@
 
-../COPYING:		mysql.info $(GT)
-	perl -w $(GT) mysql.info "GPL license" "MySQL FLOSS License Exception" > $@
-
 ../EXCEPTIONS-CLIENT: mysql.info $(GT)
 	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@
 

Docs/Support/generate-mirror-listing.pl

-#!/my/gnu/bin/perl -w -*- perl -*-
-
-# Generate a mirror listing
-
-line: while (<>) { last line if /START_OF_MIRROR_LISTING/;};
-
-print "MySQL mirror listing\n";
-
-line: while (<>)
-{
-  last line if /END_OF_MIRROR_LISTING/; 
-  if (/^\@strong\{([A-Za-z ]+):\}$/)
-  {
-    print "\n*** $1\n";
-  }
-  elsif (m|^\@image\{Img/[a-z-]+\} ([A-Za-z]+) \[(.*)\]|)
-  {
-    print "\n$1 [$2]\n";
-  }
-  # A hacky URL regexp
-  # (m!^\@uref\{((http\|ftp)://[^,]*), (FTP\|WWW)\}!)
-  elsif (m!^\@uref\{((http|ftp)://[^,]*), (FTP|WWW)\}!)
-  {
-    $addr = $1;
-    print "	$addr\n";
-  }
-}

Docs/Support/update-reserved-words.pl

-#!/usr/bin/perl
-
-# Based on a Emacs macro by david@mysql.com
-# Implemented in Perl by jeremy@mysql.com
-# 2001-11-20 Fixups by arjen@mysql.com, 2 keywords and 15 synonyms were missing
-# 2001-12-07 Fixup by arjen@mysql.com, add column headings for multitable.
-# 2002-05-01 Fixup by arjen@mysql.com, use 3 columns instead of 4.
-# 2002-05-03 Fixup by arjen@mysql.com, fill last row to full # of columns.
-# 2002-06-14 Fixup by arjen@mysql.com, Issue a "bk edit manual.texi".
-
-print STDERR "Scanning lex.h for symbols..\n";
-open LEX, "<../sql/lex.h";
-while($line = <LEX>) {
-  if($line =~ /\{\s*\"([A-Z_]+)\"/) {
-    $words{$1} = $1;
-  } elsif($line =~ /sql_functions/) {
-    last;
-  };
-};
-close LEX;
-
-print STDERR "Scanning sql_yacc.yy for non-reserved words...\n";
-open YACC, "<../sql/sql_yacc.yy";
-while(<YACC> !~ /^keyword:/) {};
-while(($line = <YACC>) =~ /[\s|]+([A-Z_]+)/) {
-  $keyword = $1;
-  $keyword =~ s/_SYM//;
-  delete $words{$keyword};
-};
-close YACC;
-
-
-print STDERR "Copying reserved words to an array...\n";
-foreach(keys %words) { push @words, $words{$_}; };
-
-print STDERR "Sorting array...\n";
-@words = sort @words;
-
-printf STDERR "There are %i reserved words.\n", scalar @words;
-
-@pre  = ("\@item", " \@tab", " \@tab");
-
-$list = "";
-for($i=0; $word = shift(@words); $i++) {
-  $list .= sprintf "%s %s\n", $pre[$i%3], "\@code\{$word\}";
-}
-# Fill last row to full # of columns.
-for( ; $i%3; $i++) {
-  $list .= sprintf "%s\n", $pre[$i%3];
-}
-
-`bk edit manual.texi`;
-
-open OLD, "<manual.texi";
-open NEW, ">manual-tmp.texi";
-
-print STDERR "Copying beginning of manual.texi...\n";
-while(($line = <OLD>) !~ /START_OF_RESERVED_WORDS/) { print NEW $line; };
-print NEW "\@c START_OF_RESERVED_WORDS\n\n";
-printf NEW "\@c Reserved word list updated %s by %s.\n".
-           "\@c To regenerate, use Support/update-reserved-words.pl.\n\n",
-           &pretty_date, $ENV{USER};
-
-print STDERR "Inserting list of reserved words...\n";
-# Ensure the fractions add up to 100% otherwise it looks funny in print:
-print NEW "\@multitable \@columnfractions .33 .33 .34\n";
-print NEW "\@item \@strong{Word}\n \@tab \@strong{Word}\n \@tab \@strong{Word}\n";
-print NEW $list;
-print NEW "\@end multitable\n";
-print STDERR "Skipping over old list...\n";
-while(($line = <OLD>) !~ /END_OF_RESERVED_WORDS/) {};
-print NEW "\n\@c END_OF_RESERVED_WORDS\n";
-print STDERR "Copying end of manual.texi...\n";
-while($line = <OLD>) { print NEW $line; };
-
-close OLD;
-close NEW;
-
-print STDERR "Moving manual-tmp.texi to manual.texi...\n";
-unlink "manual.texi";
-rename "manual-tmp.texi", "manual.texi";
-
-print STDERR "Reserved word list updated successfully!\n";
-
-sub pretty_date {
-  @time = ($time = shift)?((localtime($time))[0..6]):((localtime)[0..6]);
-
-  ($sec, $min, $hour, $mday, $mon, $year, $wday) = @time;
-  $wday = (Sun,Mon,Tue,Wed,Thu,Fri,Sat)[$wday];
-  $mon = (Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec)[$mon];
-  $year += 1900;
-
-  $pretty = sprintf("%s %s %2i %02i:%02i:%02i %i",
-                    $wday, $mon, $mday, $hour, $min, $sec, $year);
-
-  return $pretty;
-};
-

Docs/manual.de.texi

-\input texinfo  @c -*-texinfo-*-
-@c
-@c *********************************************************
-@c
-@c This is a dummy placeholder file for manual.de.texi in the
-@c MySQL source trees.
-@c
-@c Note, that the manual has been moved into a separate
-@c BitKeeper source tree named "mysqldoc" - do not attempt
-@c to add NEWS entries or documentation to this file! All
-@c changes to the manual should be done in the mysqldoc tree.
-@c
-@c See http://www.mysql.com/doc/en/Installing_source_tree.html
-@c for information about how to work with BitKeeper source trees.
-@c
-@c This dummy file is being replaced with the real manual from the
-@c mysqldoc tree when building the official source distribution.
-@c
-@c Please e-mail docs@mysql.com for more information or if
-@c you are interested in doing a translation.
-@c
-@c *********************************************************
-@c
-@c %**start of header
-
-@setfilename mysql.de.info
-
-@c We want the types in the same index
-@syncodeindex tp fn
-
-@c Get version information. This file is generated by the Makefile!!
-@include include.texi
-
-@ifclear tex-debug
-@c This removes the black squares in the right margin
-@finalout
-@end ifclear
-
-@c Set background for HTML
-@set _body_tags BGCOLOR=silver TEXT=#000000 LINK=#101090 VLINK=#7030B0
-@c Set some style elements for the manual in HTML form. 'suggested'
-@c natural language colors: aqua, black, blue, fuchsia, gray, green,
-@c lime, maroon, navy, olive, purple, red, silver, teal, white, and
-@c yellow. From Steeve Buehler <ahr@YogElements.com>
-@set _extra_head <style> code {color:purple} tt {color:green} samp {color:navy} pre {color:maroon} </style>
-
-@settitle Dummy MySQL Reference Manual for version @value{mysql_version}.
-
-@c We want single-sided heading format, with chapters on new pages. To
-@c get double-sided format change 'on' below to 'odd'
-@setchapternewpage on
-
-@paragraphindent 0
-
-@c %**end of header
-
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* mysql: (mysql).               MySQL documentation.
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-
-@titlepage
-@sp 10
-@center @titlefont{Empty placeholder for the MySQL Reference Manual}
-@sp 10
-@center Copyright @copyright{} 1995-2002 MySQL AB
-@c blank page after title page makes page 1 be a page front.
-@c also makes the back of the title page blank.
-@page
-@end titlepage
-
-@c This should be added. The HTML conversion also needs a MySQL version
-@c number somewhere.
-
-@iftex
-@c change this to double if you want formatting for double-sided
-@c printing
-@headings single
-
-@oddheading @thischapter @| @| @thispage
-@evenheading @thispage @| @| MySQL Technical Reference for Version @value{mysql_version}
-
-@end iftex
-
-@node Top, (dir), (dir), (dir)
-
-@ifinfo
-This is an empty placeholder file for the MySQL manual.
-
-The MySQL manual is now maintained in a separate BitKeeper source tree!
-Please see @url{http://www.mysql.com/doc/en/Installing_source_tree.html}
-for more info on how to work with BitKeeper.
-
-Please do not attempt to edit this file to add NEWS entries or to add
-documentation! Use the one in the @code{mysqldoc} BK tree instead.
-
-This file will be replaced with the current @code{manual.de.texi} when building
-the official source distribution.
-
-You can find a specific manual for any older version of MySQL
-in the binary or source distribution for that version.
-@end ifinfo
-
-@bye

Docs/manual.texi

-\input texinfo  @c -*-texinfo-*-
-@c
-@c *********************************************************
-@c
-@c This is a dummy placeholder file for manual.texi in the
-@c MySQL source trees.
-@c
-@c Note, that the manual has been moved into a separate
-@c BitKeeper source tree named "mysqldoc" - do not attempt
-@c to add NEWS entries or documentation to this file! All
-@c changes to the manual should be done in the mysqldoc tree.
-@c
-@c See http://www.mysql.com/doc/en/Installing_source_tree.html
-@c for information about how to work with BitKeeper source trees.
-@c
-@c This dummy file is being replaced with the real manual from the
-@c mysqldoc tree when building the official source distribution.
-@c
-@c Please e-mail docs@mysql.com for more information or if
-@c you are interested in doing a translation.
-@c
-@c *********************************************************
-@c
-@c %**start of header
-
-@setfilename mysql.info
-
-@c We want the types in the same index
-@syncodeindex tp fn
-
-@c Get version information. This file is generated by the Makefile!!
-@include include.texi
-
-@ifclear tex-debug
-@c This removes the black squares in the right margin
-@finalout
-@end ifclear
-
-@c Set background for HTML
-@set _body_tags BGCOLOR=silver TEXT=#000000 LINK=#101090 VLINK=#7030B0
-@c Set some style elements for the manual in HTML form. 'suggested'
-@c natural language colors: aqua, black, blue, fuchsia, gray, green,
-@c lime, maroon, navy, olive, purple, red, silver, teal, white, and
-@c yellow. From Steeve Buehler <ahr@YogElements.com>
-@set _extra_head <style> code {color:purple} tt {color:green} samp {color:navy} pre {color:maroon} </style>
-
-@settitle Dummy MySQL Reference Manual for version @value{mysql_version}.
-
-@c We want single-sided heading format, with chapters on new pages. To
-@c get double-sided format change 'on' below to 'odd'
-@setchapternewpage on
-
-@paragraphindent 0
-
-@c %**end of header
-
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* mysql: (mysql).               MySQL documentation.
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-
-@titlepage
-@sp 10
-@center @titlefont{Empty placeholder for the MySQL Reference Manual}
-@sp 10
-@center Copyright @copyright{} 1995-2002 MySQL AB
-@c blank page after title page makes page 1 be a page front.
-@c also makes the back of the title page blank.
-@page
-@end titlepage
-
-@c This should be added. The HTML conversion also needs a MySQL version
-@c number somewhere.
-
-@iftex
-@c change this to double if you want formatting for double-sided
-@c printing
-@headings single
-
-@oddheading @thischapter @| @| @thispage
-@evenheading @thispage @| @| MySQL Technical Reference for Version @value{mysql_version}
-
-@end iftex
-
-@node Top, (dir), (dir), (dir)
-
-@ifinfo
-This is an empty placeholder file for the MySQL manual.
-
-The MySQL manual is now maintained in a separate BitKeeper source tree!
-Please see @url{http://www.mysql.com/doc/en/Installing_source_tree.html}
-for more info on how to work with BitKeeper.
-
-Please do not attempt to edit this file to add NEWS entries or to add
-documentation! Use the one in the @code{mysqldoc} BK tree instead.
-
-This file will be replaced with the current @code{manual.texi} when building
-the official source distribution.
-
-You can find a specific manual for any older version of MySQL
-in the binary or source distribution for that version.
-@end ifinfo
-
-@bye

Docs/manual_toc.html

-<html>
-<head>
-<title>Place holder for manual_toc.html</title>
-</head>
-<body>
-This is just a place holder for the autogenerated manual_toc.html
-to make "make dist" happy.
-</body>
-</html>

Docs/mysql.info

+This is mysql.info, produced by makeinfo version 4.8 from manual.texi.
+
+START-INFO-DIR-ENTRY
+* mysql: (mysql).               MySQL documentation.
+END-INFO-DIR-ENTRY
+
+
+File: mysql.info,  Node: Top,  Next: (dir),  Prev: (dir),  Up: (dir)
+
+This is an empty placeholder file for the MySQL manual.
+
+The MySQL manual is now maintained in a separate BitKeeper source tree!
+Please see `http://www.mysql.com/doc/en/Installing_source_tree.html'
+for more info on how to work with BitKeeper.
+
+This file will be replaced with the current `mysql.info' when building
+the official source distribution.
+
+You can find a specific manual for any older version of MySQL in the
+binary or source distribution for that version.
+
+
+
+Tag Table:
+Node: Top166
+
+End Tag Table

Docs/reservedwords.texi

-@c This is a placeholder file for the autogenerated MySQL reserved
-@c word list "reservedwords.texi", which is being included in
-@c manual.texi when building the manual.
-@c
-@c This file will be replaced with the actual reserved word list
-@c from the "mysqldoc" BK source tree when building the official
-@c source distribution.
-@c
-@c Please note, that the manual is now maintained in a separate
-@c "mysqldoc" BitKeeper tree! See
-@c
-@c http://www.mysql.com/doc/en/Installing_source_tree.html
-@c
-@c for more info on how to work with the MySQL BK source trees.

configure.in

@@ -3227,7 +3227,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  sql-common/Makefile SSL/Makefile dnl
  dbug/Makefile scripts/Makefile dnl
  include/Makefile sql-bench/Makefile tools/Makefile dnl
- tests/Makefile Docs/Makefile Docs/Images/Makefile support-files/Makefile dnl
+ tests/Makefile Docs/Makefile support-files/Makefile dnl
  support-files/MacOSX/Makefile mysql-test/Makefile dnl
  netware/Makefile dnl
  include/mysql_version.h dnl

scripts/make_win_src_distribution.sh

@@ -289,9 +289,7 @@ cd $SOURCE
 for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\
          INSTALL-SOURCE INSTALL-WIN \
          INSTALL-WIN-SOURCE \
-         Docs/manual_toc.html  Docs/manual.html \
-         Docs/manual.txt Docs/mysqld_error.txt \
-         Docs/INSTALL-BINARY Docs/internals.texi
+         Docs/INSTALL-BINARY
 do
   print_debug "Copying file '$i'"
   if [ -f $i ]