summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/1/pkg4
-rw-r--r--man/7/pkg7
-rw-r--r--man/7/pkg-setup2
3 files changed, 4 insertions, 9 deletions
diff --git a/man/1/pkg b/man/1/pkg
index ac88ca6..6671a88 100644
--- a/man/1/pkg
+++ b/man/1/pkg
@@ -131,9 +131,9 @@ Note: If you haven't disabled AUTOUPDATE, B<pkg upgrade> will suffice here
Push local changes to the packages_root.
Note: If you haven't disabled AUTOUPDATE, B<pkg push> will suffice here
-=item * B<pkg refresh core>
+=item * B<pkg refresh pkg>
-'Fake-Upgrade'. Execute the appropiate commands as if the core package had been
+'Fake-Upgrade'. Execute the appropiate commands as if the pkg package had been
upgraded (useful when you change something but don't want to commit/push yet)
=back
diff --git a/man/7/pkg b/man/7/pkg
index c260975..a6d41b2 100644
--- a/man/7/pkg
+++ b/man/7/pkg
@@ -51,11 +51,6 @@ The package root should contain the pkglist script shipped in include/.
If it doesn't, PKGLIST_PATH in .pkg.conf must be set to the appropiate
location on the package root host.
-=head2 CAUTION
-
-The file $PKG_ROOT/core/include/pkglist is used by pkg, so make sure the git
-repo is checked out. A regular 'git checkout -f' in the core repo is recommended.
-
=head1 THE PACKAGE LIST
Thi package list lives in the files B<.list> and B<.list-remote> mentioned
@@ -68,7 +63,7 @@ It consists of one line per package, each line containing three items separated
by a single whitespace. The first item is the package name, the second one the
repository type (DVCS), the third the current revision. Example:
- core git 82d716d01dee0329af7df5e67b55558fe3ff1466
+ pkg git 82d716d01dee0329af7df5e67b55558fe3ff1466
=head1 WHAT IS A PACKAGE?
diff --git a/man/7/pkg-setup b/man/7/pkg-setup
index 2efd7d3..a6438a1 100644
--- a/man/7/pkg-setup
+++ b/man/7/pkg-setup
@@ -8,7 +8,7 @@ pkg - Package root setup
First, you'll need to create a root directory (from now on PKG_ROOT) on the
server which shall from now on host all your packages.
-Then you need to put the pkg git repository into F<PKG_ROOT/core> - it's recommended
+Then you need to put the pkg git repository into F<PKG_ROOT/pkg> - it's recommended
to do this via git clone --bare.
Copy the pkglist script (include/pkglist) to F<PKG_ROOT/pkglist>.