From 2ebe74787978cfb3ed4779975765d9366ebb8924 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sat, 3 Mar 2012 13:48:58 -0500 Subject: [PATCH] igor fixes --- pkg/pkg-backup.8 | 3 ++- pkg/pkg-create.8 | 29 ++++++++++++++++++----------- pkg/pkg-info.8 | 6 ++++-- pkg/pkg-install.8 | 3 ++- pkg/pkg-register.8 | 8 +++++--- pkg/pkg-repo.8 | 2 +- pkg/pkg-search.8 | 3 ++- pkg/pkg-updating.8 | 8 +++++--- pkg/pkg-version.8 | 6 ++++-- pkg/pkg.8 | 5 +++-- 10 files changed, 46 insertions(+), 27 deletions(-) diff --git a/pkg/pkg-backup.8 b/pkg/pkg-backup.8 index a7c94bd446..6fa5d3e166 100644 --- a/pkg/pkg-backup.8 +++ b/pkg/pkg-backup.8 @@ -45,7 +45,8 @@ will use stdout for it's output. .It Fl r Ar Uses .Ar file -in order to restore the local package database. Useful in case of a database +in order to restore the local package database. +Useful in case of a database crash of lost to restore your database from previously made backup. .El .Sh ENVIRONMENT diff --git a/pkg/pkg-create.8 b/pkg/pkg-create.8 index 1605f3814d..8b1e3c876d 100644 --- a/pkg/pkg-create.8 +++ b/pkg/pkg-create.8 @@ -40,8 +40,8 @@ .\" --------------------------------------------------------------------------- .Sh DESCRIPTION .Nm -is used to create packages from binaries installed on your computer. Packages -thus created can be distributed and subsequently installed on other machines +is used to create packages from binaries installed on your computer. +Packages thus created can be distributed and subsequently installed on other machines using the .Cm pkg add command. @@ -51,8 +51,8 @@ The following options are supported by .Nm : .Bl -tag -width ".Fl m Ar manifest" .It Fl a -Create packages for all binaries installed on your system. You can't use this -option along with the +Create packages for all binaries installed on your system. +You can't use this option along with the .Fl g , x or .Fl X @@ -81,7 +81,8 @@ Specify manifest directory \" TODO: New description .It Fl f Ar format Set .Ar format -as the package output format. It can be one of +as the package output format. +It can be one of .Ar txz , tbz , tgz or .Ar tar @@ -92,7 +93,8 @@ is assumed. .It Fl o Ar outdir Set .Ar outdir -as the output directory. If this option is not given, all created packages will +as the output directory. +If this option is not given, all created packages will be saved in the current directory. .It Fl n Do not overwrite already existing packages @@ -116,7 +118,8 @@ This is a string of the form which designate the port this package was built from. .It Cm comment Ar comment-string .Ar comment-string -is a one-line description of this package. It is the equivalent of the +is a one-line description of this package. +It is the equivalent of the .Dv COMMENT variable for a port, not a way to put comments in a .Pa +MANIFEST @@ -136,7 +139,8 @@ The path where the files contained in this package are installed .Pq usually Pa /usr/local . .It Cm flatsize Ar size The size that the files contained in this package will occupy on your system -once uncompressed. This value does not take into account files stored in the +once uncompressed. +This value does not take into account files stored in the package database. .It Cm dep Ar dep-name dep-origin dep-version Declare a dependency on the package which name, origin and version match @@ -156,11 +160,14 @@ to the value .Ar option-value . .It Cm file Ar sha256-hash path .Cm file -entries list files included in the package. If the file is a regular one, such -an entry contains its sha256 digest along with its path. If a packaged file is +entries list files included in the package. +If the file is a regular one, such +an entry contains its sha256 digest along with its path. +If a packaged file is a link, you must use this entry's other form, as described below. .It Cm file Ar - path -Same as above but for file links. The sha256 hash is replaced with a +Same as above but for file links. +The sha256 hash is replaced with a .Ar - (dash). .It Cm dir Ar path diff --git a/pkg/pkg-info.8 b/pkg/pkg-info.8 index 6c6577cd24..4b5da6e04c 100644 --- a/pkg/pkg-info.8 +++ b/pkg/pkg-info.8 @@ -83,10 +83,12 @@ Prints only the requested information without displaying many hints. .It Fl O Search is done by the .Ar -origin. Added only for Ports compatibility. +origin. +Added only for Ports compatibility. .Pp .It Fl E -Currently not implemented. Added only for Ports compatibility. +Currently not implemented. +Added only for Ports compatibility. .It Fl o Display .Ar diff --git a/pkg/pkg-install.8 b/pkg/pkg-install.8 index 79923630c5..ec87051a68 100644 --- a/pkg/pkg-install.8 +++ b/pkg/pkg-install.8 @@ -28,7 +28,8 @@ .Sh DESCRIPTION .Nm is used for installation of packages from a remote package -repository database. It can install multiple packages +repository database. +It can install multiple packages specified on the command-line from multiple repositories. .Pp If a package is found to exists in more than one package diff --git a/pkg/pkg-register.8 b/pkg/pkg-register.8 index 26cd64e5f5..95ec7f1357 100644 --- a/pkg/pkg-register.8 +++ b/pkg/pkg-register.8 @@ -40,15 +40,17 @@ Tells .Nm to treat the package to be registered as a legacy one (old style package) .It Fl d -Mark the package for registering as orphan. Will be automatically removed -if no other packages depend on it. For more information please refer to +Mark the package for registering as orphan. +Will be automatically removed if no other packages depend on it. +For more information please refer to .Xr pkg-autoremove 8 .It Fl f Ar Specifies the packing list file .It Fl m Ar Specifies the meta data directory to use when registering the package .It Fl a Ar -Specifies the package arch. If this option is not set then the arch will +Specifies the package arch. +If this option is not set then the arch will be automatically detected upon package registration. .It Fl i Ar Specifies the package input path. diff --git a/pkg/pkg-repo.8 b/pkg/pkg-repo.8 index 66dbc3bf91..b0201b9128 100644 --- a/pkg/pkg-repo.8 +++ b/pkg/pkg-repo.8 @@ -29,7 +29,7 @@ is used for creating package repositories of already available packages. .Nm -is usefull for creating a package repository database, +is useful for creating a package repository database, and then sharing it with other people. .Pp When diff --git a/pkg/pkg-search.8 b/pkg/pkg-search.8 index 73fc1a6c0c..84d662dae1 100644 --- a/pkg/pkg-search.8 +++ b/pkg/pkg-search.8 @@ -73,7 +73,8 @@ Displays the dependencies of .It Fl s Displays the size of the package .It Fl q -Be ``quiet''. Prints only the requested information without +Be ``quiet''. +Prints only the requested information without displaying many hints. .It Fl o Displays diff --git a/pkg/pkg-updating.8 b/pkg/pkg-updating.8 index dcbe81c28a..89a7b94bd6 100644 --- a/pkg/pkg-updating.8 +++ b/pkg/pkg-updating.8 @@ -31,7 +31,8 @@ The .Nm command scans the installed ports and show all UPDATING entries that affect one -of the installed ports. Alternative a list of pkg-names could be passed. +of the installed ports. +Alternativly a list of pkg-names could be passed. .Sh OPTIONS The following options are supported by .Nm : @@ -41,8 +42,9 @@ UPDATING entries for the named packages are displayed. .It Fl d Ar date Only entries newer than .Ar date -are shown. Use a YYYYMMDD date format. -.It Fl f Ar file +are shown. +Use a YYYYMMDD date format. +.It Fl f Ar file Defines a alternative location of the UPDATING .Ar file . .El diff --git a/pkg/pkg-version.8 b/pkg/pkg-version.8 index c94517ea1f..bb60396318 100644 --- a/pkg/pkg-version.8 +++ b/pkg/pkg-version.8 @@ -53,7 +53,8 @@ Use INDEX file for determining if a package is out of date .It Fl o Display package origin, instead of package name. .It Fl q -Be quiet. Less output will be produced. +Be quiet. +Less output will be produced. .It Fl v Be verbose. .It Fl l Ar limchar @@ -62,7 +63,8 @@ Display only the packages which status flag matches the one specified by .It Fl L Ar limchar Does the opposite of .Fl l -flag. Displays the packages which status flag does not match the one +flag. +Displays the packages which status flag does not match the one specified by .Ar limchar .It Fl X diff --git a/pkg/pkg.8 b/pkg/pkg.8 index d78ddb23a4..6f8ab1011f 100644 --- a/pkg/pkg.8 +++ b/pkg/pkg.8 @@ -42,7 +42,7 @@ The following options are supported by Displays the current version of .Nm .It Fl d -Show debug informations +Show debug information .It Fl j Ao jail name or id Ac .Nm will execute in the given @@ -88,7 +88,8 @@ Display information about installed packages. .It Ic install Install a package from a remote package repository. If a package is found in more than one remote repository, -then installation happens from the first one. If a package +then installation happens from the first one. +If a package fails to fetch from the remote repository, the next one in the list is tried, until the package is fetched. .It Ic query