Fix some typos in docs and translations (thanks to timeless, closes: 368665)

diff --git a/COMPILING b/COMPILING
index fadbe171b5050005eea5f7fa21b24753b96cf65b..5ea5e52d1f30fb26089fcd4892b4bf158c636ddf 100644 (file)
--- a/COMPILING
+++ b/COMPILING
@@ -9,14 +9,14 @@ To compile this you need a couple things
     g++ 2.8 works OK and newer egcs work well also. Nobody has tried it
     on other compilers :< You will need a properly working STL as well.
   - A C library with the usual POSIX functions and a BSD socket layer. 
     g++ 2.8 works OK and newer egcs work well also. Nobody has tried it
     on other compilers :< You will need a properly working STL as well.
   - A C library with the usual POSIX functions and a BSD socket layer. 

-    If you OS conforms to the Single Unix Spec then you are fine:
+    If your OS conforms to the Single Unix Spec then you are fine:

       http://www.opengroup.org/onlinepubs/7908799/index.html      
   - Refer to the Build-Depends information in debian/control for
     additional requirements (some of which are Debian-specific)
 
 ** NOTICE **
 The C++ global constructors do not link correctly when using non-shared
       http://www.opengroup.org/onlinepubs/7908799/index.html      
   - Refer to the Build-Depends information in debian/control for
     additional requirements (some of which are Debian-specific)
 
 ** NOTICE **
 The C++ global constructors do not link correctly when using non-shared

-libaries. This is probably the correct behavior of the linker, but I have
+libraries. This is probably the correct behavior of the linker, but I have

 not yet had time to devise a work around for it. The correct thing to 
 do is add a reference to debSystem in apt-pkg/init.cc, 
 assert(&debSystem == 0) would be fine for instance.
 not yet had time to devise a work around for it. The correct thing to 
 do is add a reference to debSystem in apt-pkg/init.cc, 
 assert(&debSystem == 0) would be fine for instance.


@@ -29,7 +29,7 @@ I don't really care if your not-SUS OS doesn't work. It is simply too
 much work to maintain patches for dysfunctional OSs. I highly suggest you
 contact your vendor and express intrest in a conforming C library.
 
 much work to maintain patches for dysfunctional OSs. I highly suggest you
 contact your vendor and express intrest in a conforming C library.
 

-That said, there are lots of finniky problems that must be delt with even
+That said, there are lots of finicky problems that must be dealt with even

 between the supported OS's. Primarily the path I choose to take is to put
 a shim header file in build/include that transparently adds the required 
 functionality. Patches to make autoconf detect these cases and generate the 
 between the supported OS's. Primarily the path I choose to take is to put
 a shim header file in build/include that transparently adds the required 
 functionality. Patches to make autoconf detect these cases and generate the 


@@ -39,12 +39,12 @@ Current shims:
   * C99 integer types 'inttypes.h' 
   * sys/statvfs.h to convert from BSD/old-glibc statfs to SUS statvfs
   * rfc2553 hostname resolution (methods/rfc*), shims to normal gethostbyname.
   * C99 integer types 'inttypes.h' 
   * sys/statvfs.h to convert from BSD/old-glibc statfs to SUS statvfs
   * rfc2553 hostname resolution (methods/rfc*), shims to normal gethostbyname.

-    The more adventerous could steal the KAME IPv6 enabled resolvers for those
+    The more adventurous could steal the KAME IPv6 enabled resolvers for those

     OS's with IPv6 support but no rfc2553 (why?)
   * define _XOPEN_EXTENDED_SOURCE to bring in h_errno on HP-UX
   * socklen_t shim in netdb.h if the OS does not have socklen_t
   
     OS's with IPv6 support but no rfc2553 (why?)
   * define _XOPEN_EXTENDED_SOURCE to bring in h_errno on HP-UX
   * socklen_t shim in netdb.h if the OS does not have socklen_t
   

-The only completely non-shimed OS is Linux with glibc2.1, glibc2.0 requires
+The only completely non-shimmed OS is Linux with glibc2.1, glibc2.0 requires

 the first three shims.
 
 Platform Notes
 the first three shims.
 
 Platform Notes


@@ -77,7 +77,7 @@ OpenBSD
 HP-UX
   HP-UX nyquist B.10.20 C 9000/780 2016574337 32-user license
   - Evil OS, does not conform very well to SUS
 HP-UX
   HP-UX nyquist B.10.20 C 9000/780 2016574337 32-user license
   - Evil OS, does not conform very well to SUS

-     1) snprintf exists but is not prototyped, ignore spurios warnings
+     1) snprintf exists but is not prototyped, ignore spurious warnings

      2) No socklen_t
      3) Requires -D_XOPEN_SOURCE_EXTENDED for h_errno
     configure should fix the last two (see above)
      2) No socklen_t
      3) Requires -D_XOPEN_SOURCE_EXTENDED for h_errno
     configure should fix the last two (see above)

diff --git a/README.make b/README.make
index c043f10f6792b676cbc22a17196ab6f9bc5053e4..69d79d37a2dc511d3a3f4c550c4f3188369808e6 100644 (file)
--- a/README.make
+++ b/README.make
@@ -36,12 +36,12 @@ cd into it to edit your source code!
 
 The make system also performs dependency generation on the fly as the
 compiler runs. This is extremely fast and accurate. There is however
 
 The make system also performs dependency generation on the fly as the
 compiler runs. This is extremely fast and accurate. There is however

-one failure condition that occures when a header file is erased. In
+one failure condition that occurs when a header file is erased. In

 this case you should run make clean to purge the .o and .d files to
 rebuild.
 
 this case you should run make clean to purge the .o and .d files to
 rebuild.
 

-The final significant deviation from normal make practicies is 
-in how the build directory is managed. It is not mearly a mirror of
+The final significant deviation from normal make practices is 
+in how the build directory is managed. It is not nearly a mirror of

 the source directory but is logically divided in the following manner
    bin/
      methods/
 the source directory but is logically divided in the following manner
    bin/
      methods/


@@ -51,12 +51,12 @@ the source directory but is logically divided in the following manner
      apt-pkg/
    obj/
      apt-pkg/
      apt-pkg/
    obj/
      apt-pkg/

-     cmndline/
+     cmdline/

      [...]
 Only .o and .d files are placed in the obj/ subdirectory. The final compiled
 binaries are placed in bin, published headers for inter-component linking
 are placed in include/ and documentation is generated into doc/. This means
      [...]
 Only .o and .d files are placed in the obj/ subdirectory. The final compiled
 binaries are placed in bin, published headers for inter-component linking
 are placed in include/ and documentation is generated into doc/. This means

-all runnable programs are within the bin/ directory, a huge benifit for
+all runnable programs are within the bin/ directory, a huge benefit for

 debugging inter-program relationships. The .so files are also placed in
 bin/ for simplicity.
 
 debugging inter-program relationships. The .so files are also placed in
 bin/ for simplicity.
 


@@ -87,9 +87,9 @@ Autoconf
 ~~~~~~~~
 Straight out of CVS you have to initialize autoconf. This requires 
 automake (I really don't know why) and autoconf and requires doing 
 ~~~~~~~~
 Straight out of CVS you have to initialize autoconf. This requires 
 automake (I really don't know why) and autoconf and requires doing 

-  aclocal -I buidlib
+  aclocal -I buildlib

   autoconf
   autoconf

-[Altertatively you can run make startup in the top level build dir]
+[Alternatively you can run make startup in the top level build dir]

 
 Autoconf is configured to do some basic system probes for optional and 
 required functionality and generate an environment.mak and include/config.h 
 
 Autoconf is configured to do some basic system probes for optional and 
 required functionality and generate an environment.mak and include/config.h 


@@ -103,7 +103,7 @@ build include/ dir and perhaps writing some replacement code and
 linking it in. To the fullest extent possible the source code should conform
 to standards and not cater to broken systems.
 
 linking it in. To the fullest extent possible the source code should conform
 to standards and not cater to broken systems.
 

-Autoconf will also wite a makefile into the top level of the build dir, 
+Autoconf will also write a makefile into the top level of the build dir, 

 this simply acts as a wrapper to the main top level make in the source tree.
 There is one big warning, you can't use both this make file and the
 ones in the top level tree. Make is not able to resolve rules that 
 this simply acts as a wrapper to the main top level make in the source tree.
 There is one big warning, you can't use both this make file and the
 ones in the top level tree. Make is not able to resolve rules that 

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 59f994cd7e606e0ad091f78000530e83e48341aa..2e2a976bb53581c3a462fddd51e1309f2382b463 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -497,7 +497,7 @@ void pkgProblemResolver::MakeScores()
       
       signed short &Score = Scores[I->ID];
       
       
       signed short &Score = Scores[I->ID];
       

-      /* This is arbitary, it should be high enough to elevate an
+      /* This is arbitrary, it should be high enough to elevate an

          essantial package above most other packages but low enough
         to allow an obsolete essential packages to be removed by
         a conflicts on a powerfull normal package (ie libc6) */
          essantial package above most other packages but low enough
         to allow an obsolete essential packages to be removed by
         a conflicts on a powerfull normal package (ie libc6) */

diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index fad6d1da9b9025f1a3879cae4b74f228544d1e16..e28071e81959fb04b3f4562d2740835defe7a229 100644 (file)
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -34,7 +34,7 @@
      ConfigFile - Means this flag should be interprited as the name of 
                   a config file to read in at this point in option processing.
                   Implies HasArg.
      ConfigFile - Means this flag should be interprited as the name of 
                   a config file to read in at this point in option processing.
                   Implies HasArg.

-     ArbItem    - Means the item is an arbitary configuration string of
+     ArbItem    - Means the item is an arbitrary configuration string of

                   the form item=value, where item is passed directly
                   to the configuration class.
    The default, if the flags are 0 is to use Boolean
                   the form item=value, where item is passed directly
                   to the configuration class.
    The default, if the flags are 0 is to use Boolean

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index eacc7077ad36f7fc82c72bbbbe6c7ec16c29c843..3a0abc5a819df32dd8cea85e3313d875ce11e1d4 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -461,7 +461,7 @@ string Base64Encode(const string &S)
                                                                        /*}}}*/
 // stringcmp - Arbitary string compare                                 /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // stringcmp - Arbitary string compare                                 /*{{{*/
 // ---------------------------------------------------------------------

-/* This safely compares two non-null terminated strings of arbitary 
+/* This safely compares two non-null terminated strings of arbitrary 

    length */
 int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd)
 {
    length */
 int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd)
 {

diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 616714e2927f4cb4a674be6e9cfdba802b3f5b37..ca18f1d7574211a10f14d7ba02d960f499b8a835 100644 (file)
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -39,7 +39,7 @@
          ordering.  
    
    Each of the features can be enabled in the sorting routine at an 
          ordering.  
    
    Each of the features can be enabled in the sorting routine at an 

-   arbitary priority to give quite abit of control over the final unpacking
+   arbitrary priority to give quite abit of control over the final unpacking

    order.
 
    The rules listed above may never be violated and are called Critical.
    order.
 
    The rules listed above may never be violated and are called Critical.

diff --git a/buildlib/copy.mak b/buildlib/copy.mak
index 15f448827b3e7915f34a2204313de0a56e723ecb..3ae11a7eb9fec54d317881ed62c96cb43f511a6e 100644 (file)
--- a/buildlib/copy.mak
+++ b/buildlib/copy.mak
@@ -1,6 +1,6 @@
 # -*- make -*-
 
 # -*- make -*-
 

-# This installs arbitary files into a directory
+# This installs arbitrary files into a directory

 
 # Input
 # $(SOURCE) - The documents to use
 
 # Input
 # $(SOURCE) - The documents to use

diff --git a/debian/changelog b/debian/changelog
index 09087421e7879999bd6519a0356f38a00b7e207a..72c4f9c41d6f34bd550646aecd35f3831f231f2e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 apt (0.7.15~exp4) UNRELEASED; urgency=low
 
 apt (0.7.15~exp4) UNRELEASED; urgency=low
 

-  * 
+  [Luca Bruno]
+  * Fix some typos in docs and translations (thanks to timeless, closes: 368665)

 
  -- Luca Bruno <lethalman88@gmail.com>  Fri, 03 Oct 2008 20:00:18 +0200
 
 
  -- Luca Bruno <lethalman88@gmail.com>  Fri, 03 Oct 2008 20:00:18 +0200
 

diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja
index 3fa931ae5192e48a1a16f61000507a010d9a3da4..d633424617cc93b4b5122b11e3cafac1da84199e 100644 (file)
--- a/doc/ja/apt.ent.ja
+++ b/doc/ja/apt.ent.ja
@@ -296,7 +296,7 @@
       <term><option>-o</option></term>
       <term><option>--option</option></term>
 <!--
       <term><option>-o</option></term>
       <term><option>--option</option></term>
 <!--

-     <listitem><para>Set a Configuration Option; This will set an arbitary
+     <listitem><para>Set a Configuration Option; This will set an arbitrary

       configuration option. The syntax is <option>-o Foo::Bar=bar</option>.
      </para>
 -->
       configuration option. The syntax is <option>-o Foo::Bar=bar</option>.
      </para>
 -->

diff --git a/po/cy.po b/po/cy.po
index ba949eb7fee59d054f72ac411ef3177b99ca5289..fcc70d4233588988b38f79fea4fcad11d5142166 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -251,7 +251,7 @@ msgstr ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 
 #: cmdline/apt-cdrom.cc:78
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 
 #: cmdline/apt-cdrom.cc:78