From dd0594df724cf46b2e5e5ea9933af7dab4c5b025 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Mon, 20 Sep 2004 16:57:24 +0000 Subject: [PATCH] James speeling fixes Author: jgg Date: 2001-04-04 05:00:14 GMT James speeling fixes --- doc/cache.sgml | 54 ++++++++++++++++++++++++------------------------- doc/design.sgml | 14 ++++++------- doc/files.sgml | 36 ++++++++++++++++----------------- doc/method.sgml | 30 +++++++++++++-------------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/doc/cache.sgml b/doc/cache.sgml index 7d233476..f6f2e9c7 100644 --- a/doc/cache.sgml +++ b/doc/cache.sgml @@ -4,7 +4,7 @@ APT Cache File Format Jason Gunthorpe jgg@debian.org -$Id: cache.sgml,v 1.8 2001/02/20 07:03:17 jgg Exp $ +$Id: cache.sgml,v 1.9 2001/04/04 05:00:14 jgg Exp $ This document describes the complete implementation and format of the APT @@ -53,10 +53,10 @@ contained in the status file which might be considered a separate package file.

-Please understand, this is designed as a -CACHE FILE- it is not ment to be -used on any system other than the one it was created for. It is not ment to -be authoritative either, ie if a system crash or software failure occures it -must be perfectly acceptable for the cache file to be in an inconsistant +Please understand, this is designed as a -CACHE FILE- it is not meant to be +used on any system other than the one it was created for. It is not meant to +be authoritative either, i.e. if a system crash or software failure occurs it +must be perfectly acceptable for the cache file to be in an inconsistent state. Furthermore at any time the cache file may be erased without losing any information. @@ -67,7 +67,7 @@ to extend it with associate cache files that contain other information.

To keep memory use down the cache file only contains often used fields and -fields that are inexepensive to store, the Package file has a full list of +fields that are inexpensive to store, the Package file has a full list of fields. Also the client may assume that all items are perfectly valid and need not perform checks against their correctness. Removal of information from the cache is possible, but blanks will be left in the file, and @@ -84,7 +84,7 @@ go through a fixup stage to get a real memory pointer. This is done by taking the index, multiplying it by the type size and then adding it to the start address of the memory block. This sounds complex, but in C it is a single array dereference. Because all items are aligned to -their size and indexs are stored as multiples of the size of the structure +their size and indexes are stored as multiples of the size of the structure the format is immediately portable to all possible architectures - BUT the generated files are -NOT-. @@ -183,7 +183,7 @@ be erased and rebuilt if it is true. VerFileSz ProvidesSz *Sz contains the sizeof() that particular structure. It is used as an -extra consistancy check on the structure of the file. +extra consistency check on the structure of the file. If any of the size values do not exactly match what the client expects then the client should refuse the load the file. @@ -192,23 +192,23 @@ the client should refuse the load the file. VersionCount DependsCount PackageFileCount -These indicate the number of each structure contianed in the cache. +These indicate the number of each structure contained in the cache. PackageCount is especially useful for generating user state structures. See Package::Id for more info. VerSysName -String representing the versiong system used for this cache +String representing the version system used for this cache Architecture Architecture the cache was built against. MaxVerFileSize The maximum size of a raw entry from the original Package file -(ie VerFile::Size) is stored here. +(i.e. VerFile::Size) is stored here. FileList This contains the index of the first PackageFile structure. The PackageFile -structures are singely linked lists that represent all package files that +structures are singly linked lists that represent all package files that have been merged into the cache. StringList @@ -240,9 +240,9 @@ function:

By iterating over each entry in the hash table it is possible to iterate over -the entire list of packages. Hash Collisions are handled with a singely linked +the entire list of packages. Hash Collisions are handled with a singly linked list of packages based at the hash item. The linked list contains only -packages that macth the hashing function. +packages that match the hashing function. @@ -250,7 +250,7 @@ packages that macth the hashing function. Package

-This contians information for a single unique package. There can be any +This contains information for a single unique package. There can be any number of versions of a given package. Package exists in a singly linked list of package records starting at the hash index of the name in the Header->HashTable. @@ -284,12 +284,12 @@ the Header->HashTable. Name of the package. VersionList -Base of a singely linked list of version structures. Each structure +Base of a singly linked list of version structures. Each structure represents a unique version of the package. The version structures contain links into PackageFile and the original text file as well as -detailed infromation about the size and dependencies of the specific +detailed information about the size and dependencies of the specific package. In this way multiple versions of a package can be cleanly handled -by the system. Furthermore, this linked list is guarenteed to be sorted +by the system. Furthermore, this linked list is guaranteed to be sorted from Highest version to lowest version with no duplicate entries. CurrentVer @@ -313,14 +313,14 @@ This is a linked list of all provides for this package name. SelectedState InstState CurrentState -These corrispond to the 3 items in the Status field found in the status +These correspond to the 3 items in the Status field found in the status file. See the section on defines for the possible values.

SelectedState is the state that the user wishes the package to be in.

InstState is the installation state of the package. This normally -should be Ok, but if the installation had an accident it may be otherwise. +should be OK, but if the installation had an accident it may be otherwise.

CurrentState indicates if the package is installed, partially installed or not installed. @@ -342,7 +342,7 @@ Flags are some useful indicators of the package's state. PackageFile

-This contians information for a single package file. Package files are +This contains information for a single package file. Package files are referenced by Version structures. This is a singly linked list based from Header.FileList @@ -408,8 +408,8 @@ Modification time for the file at time of cache generation. Version

-This contians the information for a single version of a package. This is a -singley linked list based from Package.Versionlist. +This contains the information for a single version of a package. This is a +single linked list based from Package.Versionlist.

The version list is always sorted from highest version to lowest version by @@ -470,12 +470,12 @@ Head of the linked list of Provides::NextPkgProv, forward provides. Size InstalledSize -The archive size for this version. For debian this is the size of the .deb +The archive size for this version. For Debian this is the size of the .deb file. Installed size is the uncompressed size for this version Hash This is a characteristic value representing this package. No two packages -in existance should have the same VerStr and Hash with different contents. +in existence should have the same VerStr and Hash with different contents. ID See Package::ID. @@ -775,7 +775,7 @@ allows the specification of a specific version and a target distribution.

Different section names on different versions is supported, but I -do not expect to use it. To simplify the GUI it will mearly use the section +do not expect to use it. To simplify the GUI it will merely use the section in the Package structure. This should be okay as I hope sections do not change much. @@ -814,7 +814,7 @@ information. (/var/cache/apt, FHS2)

Caching of the info/*.list is an excellent place to start, by generating all the list files into a tree structure and reverse linking them to the package -structures in the main cache file major speed gains in dpkg might be achived. +structures in the main cache file major speed gains in dpkg might be achieved. diff --git a/doc/design.sgml b/doc/design.sgml index 55fd7e55..d9f45000 100644 --- a/doc/design.sgml +++ b/doc/design.sgml @@ -7,7 +7,7 @@ Manoj Srivastava srivasta@debian.org - $Id: design.sgml,v 1.1 1998/07/02 02:58:12 jgg Exp $ + $Id: design.sgml,v 1.2 2001/04/04 05:00:15 jgg Exp $ This document is an overview of the specifications and design goals of the APT project. It also attempts to give a broad @@ -118,7 +118,7 @@ allowing the removal of packages that left the system in an untenable state by breaking the dependencies on packages that were dependent on the package being - removed. A special emhasis is placed on handling + removed. A special emphasis is placed on handling pre-dependencies correctly; the target of a predependency has to be fully configured before attempting to install the pre-dependent package. Also, @@ -138,11 +138,11 @@ Handle source lists for updates from multiple sources. APT should also be able to handle diverse methods of acquiring new packages; local filesystem, - mountable CD-ROM drives, FTP accesible repositories are + mountable CD-ROM drives, FTP accessible repositories are some of the methods that come to mind. Also, the source lists can be separated into categories, such as main, contrib, non-us, non-local, non-free, my-very-own, - etc. APT should be set up to retrive the Packages + etc. APT should be set up to retrieve the Packages files from these multiple source lists, as well as retrieving the packages themselves.

@@ -272,7 +272,7 @@

Take the order of installations and removals and build up a stream of events to send to the packaging system - (dpkg). Execute the list of events if succesful. Do not + (dpkg). Execute the list of events if successful. Do not partially install packages and leave system in broken state. Go to The Selection step as needed.

@@ -298,7 +298,7 @@

Distinct versions of the same package are recorded separately, but if multiple Packages files contain the - same version of a package, then only the forst one is + same version of a package, then only the first one is recorded. For this reason, the least expensive update source should be listed first (local file system is better than a remote ftp site)

@@ -356,7 +356,7 @@

Create an ordering of the actions to be taken.

 - Event genrator + Event generator

module to interact with dpkg

 diff --git a/doc/files.sgml b/doc/files.sgml index 6a9f3ed2..82650a9b 100644 --- a/doc/files.sgml +++ b/doc/files.sgml @@ -4,7 +4,7 @@ APT Files Jason Gunthorpe jgg@debian.org -$Id: files.sgml,v 1.8 2001/02/20 07:03:17 jgg Exp $ +$Id: files.sgml,v 1.9 2001/04/04 05:00:15 jgg Exp $ This document describes the complete implementation and format of the @@ -101,7 +101,7 @@ which indicates a standard debian archive with a dists dir. contrib, non-free or non-us. The format for the deb line is as follows:

- deb uri distribution compontent + deb uri distribution component [component ...]

@@ -116,7 +116,7 @@ which indicates a standard debian archive with a dists dir. necessary to list a number of deb lines for the same URI. APT will sort the URI list after it has generated a complete set to allow connection reuse. It is important to order things in the sourcelist - from most prefered to least prefered (fastest to slowest). + from most preferred to least preferred (fastest to slowest). URI specification @@ -125,12 +125,12 @@ URIs in the source list support a large number of access schemes. cdrom - The cdrom scheme is special in that If Modifed Since queries are never + The cdrom scheme is special in that If Modified Since queries are never performed and that APT knows how to match a cdrom to the name it was given when first inserted. APT also knows all of the possible mount points the cdrom drives and that the user should be prompted to insert a CD if it cannot be found. The path is relative to an - arbitary mount point (of APT's choosing) and must not start with a + arbitrary mount point (of APT's choosing) and must not start with a slash. The first pathname component is the given name and is purely descriptive and of the users choice. However, if a file in the root of the cdrom is called '.disk/info' its contents will be used instead of @@ -140,7 +140,7 @@ URIs in the source list support a large number of access schemes. http - This scheme specifies a HTTP server for the debian archive. HTTP is prefered + This scheme specifies a HTTP server for the debian archive. HTTP is preferred over FTP because If Modified Since queries against the Package file are possible as well as deep pipelining and resume capabilities. @@ -155,7 +155,7 @@ URIs in the source list support a large number of access schemes. file - The file scheme allows an arbitary directory in the file system to be + The file scheme allows an arbitrary directory in the file system to be considered as a debian archive. This is useful for NFS mounts and local mirrors/archives. @@ -173,13 +173,13 @@ URIs in the source list support a large number of access schemes. Hashing the URI

-All permanent information aquired from any of the sources is stored in the +All permanent information acquired from any of the sources is stored in the lists directory. Thus, there must be a way to relate the filename in the lists directory to a line in the sourcelist. To simplify things this is done by quoting the URI and treating _'s as quoteable characters and converting / to _. The URI spec says this is done by converting a sensitive character into %xx where xx is the hexadecimal representation -from the ascii character set. Examples: +from the ASCII character set. Examples: http://www.debian.org/archive/dists/stable/binary-i386/Packages @@ -209,9 +209,9 @@ here as well. The extra status file serves the same purpose as the normal dpkg status file (/var/lib/dpkg/status) except that it stores information unique to apt. This includes the autoflag, target distribution and version and any other -uniqe features that come up over time. It duplicates nothing from the normal +unique features that come up over time. It duplicates nothing from the normal dpkg status file. Please see other APT documentation for a discussion -of the exact internal behavior of these fields. The Package field is +of the exact internal behaviour of these fields. The Package field is placed directly before the new fields to indicate which package they apply to. The new fields are as follows: @@ -251,12 +251,12 @@ change to use a prebuilt version for greater speed.

The archives directory is where all downloaded .deb archives go. When the file transfer is initiated the deb is placed in partial. Once the file -is fully downloaded and its MD5 hash and size are verifitied it is moved +is fully downloaded and its MD5 hash and size are verified it is moved from partial into archives/. Any files found in archives/ can be assumed to be verified.

-No dirctory structure is transfered from the receiving site and all .deb +No directory structure is transfered from the receiving site and all .deb file names conform to debian conventions. No short (msdos) filename should be placed in archives. If the need arises .debs should be unpacked, scanned and renamed to their correct internal names. This is mostly to prevent @@ -290,7 +290,7 @@ format and style mirror the Package file. Site This is the proper host name of the site. It should not be a host within -debian.org and generally cnames should be advoided here. +debian.org and generally cnames should be avoided here. Aliases These list any commonly used aliases for the site. This field is used to make @@ -305,7 +305,7 @@ other mirrors are leaf. The Archive field gives the path(s) to the debian archive. [access] specifies the access method and may be one of ftp, http, rsync, nfs, or smb. For many of the types it is possible to prefix the path with :### -indicating that an alternate port should be used. Generaly paths +indicating that an alternate port should be used. Generally paths start with a / and end with a /, rsync is an exception in that the first directory component is not a path but a label. @@ -370,7 +370,7 @@ This is the common name we give our archives, such as stable or unstable. Component -Referes to the sub-component of the archive, main, contrib +Refers to the sub-component of the archive, main, contrib etc. Component may be omitted if there are no components for this archive. Version @@ -409,7 +409,7 @@ release, 1.3.1r6 Archive: stable -Compontent: main +Component: main Version: 1.3.1r6 Origin: Debian Label: Debian @@ -429,7 +429,7 @@ NotAutomatic: Yes And unstable, Archive: unstable -Compontent: main +Component: main Version: 2.1 Origin: Debian Label: Debian diff --git a/doc/method.sgml b/doc/method.sgml index 95fb8a52..e4ead123 100644 --- a/doc/method.sgml +++ b/doc/method.sgml @@ -4,7 +4,7 @@ APT Method Interface Jason Gunthorpe jgg@debian.org -$Id: method.sgml,v 1.7 1999/10/18 00:37:36 jgg Exp $ +$Id: method.sgml,v 1.8 2001/04/04 05:00:15 jgg Exp $ This document describes the interface that APT uses to the archive @@ -110,7 +110,7 @@ string acquire The act of bring a URI into the local pathname space. This may simply -be verifiying the existence of the URI or actually downloading it from +be verifying the existence of the URI or actually downloading it from a remote site. @@ -125,11 +125,11 @@ a remote site.

All methods operate as a sub process of a main controlling parent. 3 FD's are opened for use by the method allowing two way communication and -emergency error reporting. The FD's corrispond to the well known unix FD's, +emergency error reporting. The FD's correspond to the well known unix FD's, stdin, stdout and stderr.

-Throught operation of the method communication is done via http +Through operation of the method communication is done via http style plain text. Specifically RFC-822 (like the Package file) fields are used to describe items and a numeric-like header is used to indicate what is happening. Each of these distinct communication messages should be @@ -147,7 +147,7 @@ URI's to determine how many files are available locally.

The first line of each message is called the message header. The first 3 digits (called the Status Code) have the usual meaning found in the -http protocol. 1xx is informational, 2xx is successfull and 4xx is failure. +http protocol. 1xx is informational, 2xx is successful and 4xx is failure. The 6xx series is used to specify things sent to the method. After the status code is an informational string provided for visual debugging. @@ -171,7 +171,7 @@ status code is an informational string provided for visual debugging. Only the 6xx series of status codes is sent TO the method. Furthermore the method may not emit status codes in the 6xx range. The Codes 402 and 403 require that the method continue reading all other 6xx codes -until the proper 602/603 code is recieved. This means the method must be +until the proper 602/603 code is received. This means the method must be capable of handling an unlimited number of 600 messages.

@@ -179,12 +179,12 @@ The flow of messages starts with the method sending out a 100 Capabilities and APT sending out a 601 Configuration. After that APT begins sending 600 URI Acquire and the method sends out 200 URI Start, 201 URI Done or -400 URI Failure. No syncronization is performed, it is expected +400 URI Failure. No synchronization is performed, it is expected that APT will send 600 URI Acquire messages at -any- time and that the method should queue the messages. This allows methods like http to pipeline requests to the remote server. It should be noted however -that APT will buffer messages so it is not neccessary for the method -to be constantly ready to recieve them. +that APT will buffer messages so it is not necessary for the method +to be constantly ready to receive them. @@ -217,7 +217,7 @@ the ones it wants. Single-InstanceRequires that only one instance of the method be run This is a yes/no value. PipelineThe method is capable of pipelining. -LocalThe method only returns Filename: feilds. +LocalThe method only returns Filename: fields. Send-ConfigSend configuration to the method. Needs-CleanupThe process is kept around while the files it returned are being used. This is primarily intended for CDROM and File URIs that need @@ -230,7 +230,7 @@ This is a list of which headers each status code can use 100 Capabilities Displays the capabilities of the method. Methods should set the -pipeline bit if their underlying protocol supports pipeling. The +pipeline bit if their underlying protocol supports pipelining. The only known method that does support pipelining is http. Fields: Version, Single-Instance, Pre-Scan, Pipeline, Send-Config, Needs-Cleanup @@ -242,7 +242,7 @@ Fields: Message 102 Status Message gives a progress indication for the method. It can be used to show -pre-transfer status for internet type methods. +pre-transfer status for Internet type methods. Fields: Message 200 URI Start @@ -256,19 +256,19 @@ to specify a 201 URI Done without a URI Start which would mean no data was transfered but the file is now available. A Filename field is specified when the URI is directly available in the local pathname space. APT will either directly use that file or copy it into -another location. It is possible to return Alt-* feilds to indicate that +another location. It is possible to return Alt-* fields to indicate that another possibility for the URI has been found in the local pathname space. This is done if a decompressed version of a .gz file is found. Fields: URI, Size, Last-Modified, Filename, MD5-Hash 400 URI Failure Indicates a fatal URI failure. The URI is not retrievable from this source. -As with 201 URI Done 200 URI Start is not required to preceed +As with 201 URI Done 200 URI Start is not required to precede this message Fields: URI, Message 401 General Failure -Indicates that some unspecific failure has occured and the method is unable +Indicates that some unspecific failure has occurred and the method is unable to continue. The method should terminate after sending this message. It is intended to check for invalid configuration options or other severe conditions. -- 2.20.1