# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: stabeno@gmail.com-20080114170035-i6jd5ko6kb02k062 # target_branch: http://bazaar.launchpad.net/%7Eubuntu-core-\ # doc/ubuntu-doc/ubuntu-hardy/ # testament_sha1: 91b3228f77aca01f080776f96b30fec23519bf66 # timestamp: 2008-01-14 13:35:57 -0600 # base_revision_id: asommer70@gmail.com-20080108215830-\ # oiy3me2cd15s9byf # # Begin patch === modified file 'generic/server/C/network-applications.xml' --- generic/server/C/network-applications.xml 2007-01-12 15:03:47 +0000 +++ generic/server/C/network-applications.xml 2008-01-14 17:00:35 +0000 @@ -3652,7 +3652,7 @@ ntpdate is a bit of a blunt instrument - it can only adjust the time once a day, in one big correction. The ntp daemon ntpd is far more subtle. It calculates the drift of your system clock and continuously adjusts it, so there are no large corrections that could lead to inconsistent logs for instance. The cost is a little processing power and memory, but for a modern server this is negligible. To set up ntpd: -sudo apt-get install ntp-simple +sudo apt-get install ntp # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf6wJb8AAaXfgAAQW2P//3sA CAC//9/wUAOa87izNijSrEU9EaAEyaZGmE0w0IYT0QyCSiaanqT8KeVGNENGgZGhoAGgkkGqY0TK epg0UxN6kepoHpP1BAxhoaAAADQAAAAAkoJPU9NU9NDEjbSaNGpHog0NHqeppf15GmmJ5bprYMq2 hVhulMDhqhbOVn3tpeePBhm06L1kYBeEGiDp9ZXxQ3tm2Uo8/hAQIJciHdMHqM/RAh4SABiecllW ok12eXoag2xDEKV6hu/tgu0FRNr7hGKsrPuiE+DxR5BJOvjeJ7UFyDAmKgPoFMgYk4w34CcgooDN DmNuUDIKgYlPW0VZQbPH7fZIVqjiqJtYqXFR5fjv+I3wMHMTbopni5zY62GyQa00VfXUOHUugG5c DqLxH9uXGKJjA4yVvm3Fa2e6/IsFkdqfGYagLRuTDNfWai8chSs1ulmVGUesRkiohnKCuUK6buds qiop2aFhsUohpFuFZUJ4WGC3YhRtsNVo8qV4NJBsWyI+AbUDaRqoVMSFIYAM00hyKSkeQiy2RvHD TR4BpYdFYOTXfRYQVyopubAfVQOY35O1hdGW1/1CG0qMoSOcDlmU2xeA7QhG9dmKYUdbpmb18PZR qWLIlhqomAyW6l407Rg8OFS8DM6BlDzEdz5DHdipOcRW+ZJZLpXkLoNxJGQeYNAl9qFMLlA5HMWY MHrgtO90mdRHjPXVasxwf4UwktCtBskWFV5XRnw9DUFh14LqN9KCwaTCWek9zRnE8HhEwM5F7wgT qZiXEsAHeKYhi12srauRaAauHMPUnqKCCdPv2m4cOLDeSPxjlUxdePITVl7CO2J4g+ilWuFcGSZV 8IoMCoRYnGv1CTe9jnVgaFxAn7fNUbPUVxYrxWoeK0PqKWlhMRSmLmtxhOFYjIRWslAktOFpHwVY P3E472WbBxHmH+lNcTpPPYiYDqUAi1qHtWU+fMTUrqVxETTNIHyYqEZB3Uli5a2eWwvv3p5oCAeS thAY4uQaA6u2ZNFDOqLE7ypCFgr4XBIkxJDKCbes1CQzbyvHkmLDeAzrBVHfWYJlT4h7sIO18+jy HM+NqBurcQuxHEVAIo5aggOy2NeolMOFfp3OjslbYpKwCTWKnooqcmkqRjjVLx/+LuSKcKEh/WBL fg==