Merge branch 'docfix' of https://github.com/Temikus/aptly

cmd/cmd.go

@@ -45,9 +45,9 @@ repositories, manage local repositories, filter them, merge,
 upgrade individual packages, take snapshots and publish them
 back as Debian repositories.
 
-aptly goal is to establish repeatiblity and controlled changes
-in package environment. aptly allows to fix set of packages in
-repository, so that package installation and upgrade becomes
+aptly's goal is to establish repeatability and controlled changes
+in a package-centric environment. aptly allows to fix a set of packages
+in a repository, so that package installation and upgrade becomes
 deterministic. At the same time aptly allows to perform controlled,
 fine-grained changes in repository contents to transition your
 package environment to new version.`,

cmd/db_recover.go

@@ -26,8 +26,8 @@ func makeCmdDbRecover() *commander.Command {
 		UsageLine: "recover",
 		Short:     "recover DB after crash",
 		Long: `
-Database recover does its best to recover database after crash.
-It is recommended to backup DB before running recover.
+Database recover does its' best to recover the database after a crash.
+It is recommended to backup the DB before running recover.
 
 Example:
 

cmd/graph.go

@@ -189,7 +189,7 @@ func makeCmdGraph() *commander.Command {
 		Long: `
 Command graph displays relationship between mirrors, local repositories,
 snapshots and published repositories using graphviz package to render
-graph as image.
+graph as an image.
 
 Example:
 

cmd/mirror_create.go

@@ -63,7 +63,7 @@ func makeCmdMirrorCreate() *commander.Command {
 		Short:     "create new mirror",
 		Long: `
 Creates mirror <name> of remote repository, aptly supports both regular and flat Debian repositories exported
-via HTTP. aptly would try download Release file from remote repository and verify its signature.
+via HTTP. aptly would try download Release file from remote repository and verify its' signature.
 
 PPA urls could specified in short format:
 

cmd/mirror_drop.go

@@ -51,7 +51,7 @@ func makeCmdMirrorDrop() *commander.Command {
 		Short:     "delete mirror",
 		Long: `
 Drop deletes information about remote repository mirror <name>. Package data is not deleted
-(it could be still used by other mirrors or snapshots).  If mirror is used as source
+(since it could still be used by other mirrors or snapshots).  If mirror is used as source
 to create a snapshot, aptly would refuse to delete such mirror, use flag -force to override.
 
 Example:

cmd/mirror_show.go

@@ -67,7 +67,7 @@ func makeCmdMirrorShow() *commander.Command {
 		UsageLine: "show <name>",
 		Short:     "show details about mirror",
 		Long: `
-Shows detailed information about mirror.
+Shows detailed information about the mirror.
 
 Example:
 

cmd/mirror_update.go

@@ -58,8 +58,8 @@ func makeCmdMirrorUpdate() *commander.Command {
 		Short:     "update mirror",
 		Long: `
 Updates remote mirror (downloads package files and meta information). When mirror is created,
-this command should be run for the first time to fetch mirror contents. This command could be
-run many times to get updated repository contents. If interrupted, command could be restarted safely.
+this command should be run for the first time to fetch mirror contents. This command can be
+run multiple times to get updated repository contents. If interrupted, command can be safely restarted.
 
 Example:
 

cmd/repo_add.go

@@ -187,9 +187,9 @@ func makeCmdRepoAdd() *commander.Command {
 		Long: `
 Command adds packages to local repository from .deb (binary packages) and .dsc (source packages) files.
 When importing from directory aptly would do recursive scan looking for all files matching *.deb or *.dsc
-patterns. Every file discovered would be analyzed to extract metadata, package would be created and added
-to database. Files would be imported to internal package pool. For source packages, all required files are
-added as well automatically. Extra files for source package should be in the same directory as *.dsc file.
+patterns. Every file discovered would be analyzed to extract metadata, package would then be created and added
+to the database. Files would be imported to internal package pool. For source packages, all required files are
+added automatically as well. Extra files for source package should be in the same directory as *.dsc file.
 
 Example:
 

cmd/repo_drop.go

@@ -64,8 +64,8 @@ func makeCmdRepoDrop() *commander.Command {
 		UsageLine: "drop <name>",
 		Short:     "delete local repository",
 		Long: `
-Drop deletes information about local repo. Package data is not deleted
-(it could be still used by other mirrors or snapshots).
+Drop information about deletions from local repo. Package data is not deleted
+(since it could be still used by other mirrors or snapshots).
 
 Example:
 

cmd/repo_list.go

@@ -61,7 +61,7 @@ func makeCmdRepoList() *commander.Command {
 		UsageLine: "list",
 		Short:     "list local repositories",
 		Long: `
-List shows full list of local package repositories.
+List command shows full list of local package repositories.
 
 Example:
 

cmd/repo_show.go

@@ -45,7 +45,7 @@ func makeCmdRepoShow() *commander.Command {
 		UsageLine: "show <name>",
 		Short:     "show details about local repository",
 		Long: `
-Show shows full information about local package repository.
+Show command shows full information about local package repository.
 
 ex:
   $ aptly repo show testing

cmd/snapshot_drop.go

@@ -64,7 +64,7 @@ func makeCmdSnapshotDrop() *commander.Command {
 		UsageLine: "drop <name>",
 		Short:     "delete snapshot",
 		Long: `
-Drop removes information about snapshot. If snapshot is published,
+Drop removes information about a snapshot. If snapshot is published,
 it can't be dropped.
 
 Example:

cmd/snapshot_merge.go

@@ -59,7 +59,7 @@ func makeCmdSnapshotMerge() *commander.Command {
 		UsageLine: "merge <destination> <source> [<source>...]",
 		Short:     "merges snapshots",
 		Long: `
-Merge merges several <source> snapshots into one <destination> snapshot.
+Merge command merges several <source> snapshots into one <destination> snapshot.
 Merge happens from left to right. Packages with the same name-architecture
 pair are replaced during merge (package from latest snapshot on the list
 wins). If run with only one source snapshot, merge copies <source> into

cmd/snapshot_pull.go

@@ -170,10 +170,10 @@ func makeCmdSnapshotPull() *commander.Command {
 		UsageLine: "pull <name> <source> <destination> <package-name> ...",
 		Short:     "pull packages from another snapshot",
 		Long: `
-Command pull pulls new packages along with its dependencies to snapshot <name>
+Command pull pulls new packages along with its' dependencies to snapshot <name>
 from snapshot <source>. Pull can upgrade package version in <name> with
 versions from <source> following dependencies. New snapshot <destination>
-is created as result of this process. Packages could be specified simply
+is created as a result of this process. Packages could be specified simply
 as 'package-name' or as dependency 'package-name (>= version)'.
 
 Example:

cmd/snapshot_show.go

@@ -44,7 +44,7 @@ func makeCmdSnapshotShow() *commander.Command {
 		UsageLine: "show <name>",
 		Short:     "shows details about snapshot",
 		Long: `
-Command show displays full information about snapshot.
+Command show displays full information about a snapshot.
 
 Example:
 

cmd/snapshot_verify.go

@@ -101,7 +101,7 @@ func makeCmdSnapshotVerify() *commander.Command {
 		UsageLine: "verify <name> [<source> ...]",
 		Short:     "verify dependencies in snapshot",
 		Long: `
-Verify does depenency resolution in snapshot <name>, possibly using additional
+Verify does dependency resolution in snapshot <name>, possibly using additional
 snapshots <source> as dependency sources. All unsatisfied dependencies are
 printed.