summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2009-07-11 23:56:47 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2009-07-11 23:56:47 +0200
commit03283d14fd429e8c096b37d70b1be757e11ea6af (patch)
treebecb3bb9bbe7cef6682a25fc61177b14de098b5b /man
parentc50193f20a1ed1465f374b82a8145f79f45e778c (diff)
Documentation updates
Diffstat (limited to 'man')
-rw-r--r--man/1/ct.pod12
-rw-r--r--man/5/caretaker.conf.pod2
-rw-r--r--man/7/caretaker.pod10
3 files changed, 7 insertions, 17 deletions
diff --git a/man/1/ct.pod b/man/1/ct.pod
index 4bdba98..444647e 100644
--- a/man/1/ct.pod
+++ b/man/1/ct.pod
@@ -16,7 +16,7 @@ I<action> may be one of:
=item B<add> I<package>
-fetch given I<package> from the package_root and install it
+fetch I<package> from the package_root and install it
=item B<remove> I<package>
@@ -122,16 +122,6 @@ Contains configuration vars
=over
-=item * B<ct remote-update; ct upgrade>
-
-Get new stuff from the packages_root.
-Note: If you haven't disabled AUTOUPDATE, B<ct upgrade> will suffice here
-
-=item * B<ct local-update; ct push>
-
-Push local changes to the packages_root.
-Note: If you haven't disabled AUTOUPDATE, B<ct push> will suffice here
-
=item * B<ct refresh caretaker>
'Fake-Upgrade'. Execute the appropiate commands as if the caretaker package had been
diff --git a/man/5/caretaker.conf.pod b/man/5/caretaker.conf.pod
index c083a3f..2fe9089 100644
--- a/man/5/caretaker.conf.pod
+++ b/man/5/caretaker.conf.pod
@@ -65,7 +65,7 @@ Operate in debug mode if 1
=item B<AUTOUPDATE>=I<boolean> (--auto-update) [1]
If 1, automatically execute 'ct update' before 'ct push'
-and 'ct remote-update' before 'ct upgrade'
+and 'ct update remote' before 'ct upgrade'
=item B<GIT_USE_ORIGIN>=I<boolean> [1]
diff --git a/man/7/caretaker.pod b/man/7/caretaker.pod
index bbef02d..0b7cbb6 100644
--- a/man/7/caretaker.pod
+++ b/man/7/caretaker.pod
@@ -40,12 +40,12 @@ from this, they will be ignored by caretaker.
=head1 THE PACKAGE ROOT
-The packages_root, in caretaker referred to as $PKG_ROOT, is structured just like
-the packages directory $PKG_DIR, except that it neither contains .list nor
-.list-remote. The packages root is the central point where caretaker fetches
+The package root, in caretaker referred to as $PKG_ROOT, is structured just like
+the package directory $PKG_DIR, except that it neither contains .list nor
+.list-remote. It is the central point where caretaker fetches
packages from and pushes packages to.
-The package root should contain the pkglist script shipped in include/.
+It should contain the pkglist script shipped in include/.
If it doesn't, PKGLIST_PATH in .caretaker.conf must be set to the appropiate
location on the package root host.
@@ -53,7 +53,7 @@ location on the package root host.
The package list lives in the files B<.list> and B<.list-remote> mentioned
above. It's used to decide whether a package needs to be pulled / pushed.
-Also, the 'caretaker add' completion relies on .list-remote, and back in the days when
+Also, the 'ct add' completion relies on .list-remote, and back in the days when
caretaker supported more than one DVCS, it was used to determine which DVCS to use
for which package.