summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2014-01-28 21:37:00 +1000
committerAllan McRae <allan@archlinux.org>2014-01-28 21:37:00 +1000
commit7ae25ac67fd4dd087791be55fa3c4997be7aac52 (patch)
tree09f3fa5df548644852acb80c662e28410337f07b
parent333373f90e515bbaf6997dc7bf7385fe114689b2 (diff)
downloadpacman-7ae25ac67fd4dd087791be55fa3c4997be7aac52.tar.xz
Consistently use 'directory' instead of 'folder'
Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--NEWS2
-rw-r--r--doc/PKGBUILD.5.txt8
-rw-r--r--doc/makepkg.8.txt24
-rw-r--r--doc/makepkg.conf.5.txt12
-rw-r--r--scripts/library/README2
5 files changed, 24 insertions, 24 deletions
diff --git a/NEWS b/NEWS
index 296e196c..02148d3d 100644
--- a/NEWS
+++ b/NEWS
@@ -655,7 +655,7 @@ VERSION DESCRIPTION
- fix overzealous use of macros
- entire codebase builds with -pedantic GCC option
- libalpm-specific changes:
- - moved location of sync DBs into their own folder to thwart
+ - moved location of sync DBs into their own directory to thwart
deletion and remove naming limitations
- REQUIREDBY entries are no longer used in local DB but are
computed on the fly when needed, which should resolve
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 6c5ef842..eeb56966 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -422,16 +422,16 @@ Using VCS Sources[[VCS]]
------------------------
Building a developmental version of a package using sources from a version
control system (VCS) is enabled by specifying the source in the form
-`source=('folder::url#fragment')`. Currently makepkg supports the Bazaar, Git,
+`source=('directory::url#fragment')`. Currently makepkg supports the Bazaar, Git,
Subversion, and Mercurial version control systems. For other version control
systems, manual cloning of upstream repositories must be done in the `prepare()`
function.
The source URL is divided into three components:
-*folder*::
- (optional) Specifies an alternate folder name for makepkg to download the VCS
- source into.
+*directory*::
+ (optional) Specifies an alternate directory name for makepkg to download
+ the VCS source into.
*url*::
The URL to the VCS repository. This must include the VCS in the URL protocol
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index 6abb7fb0..29f4a036 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -220,28 +220,28 @@ Environment Variables
Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+
default.
-**PKGDEST=**"/path/to/folder"::
- Folder where the resulting packages will be stored. Overrides the
+**PKGDEST=**"/path/to/directory"::
+ Directory where the resulting packages will be stored. Overrides the
corresponding value defined in linkman:makepkg.conf[5].
-**SRCDEST=**"/path/to/folder"::
- Folder where the downloaded sources will be stored. Overrides the
+**SRCDEST=**"/path/to/directory"::
+ Directory where the downloaded sources will be stored. Overrides the
corresponding value defined in linkman:makepkg.conf[5].
-**SRCPKGDEST=**"/path/to/folder"::
- Folder where source package files will be stored. Overrides the
+**SRCPKGDEST=**"/path/to/directory"::
+ Directory where source package files will be stored. Overrides the
corresponding value defined in linkman:makepkg.conf[5].
-**LOGDEST=**"/path/to/folder"::
- Folder where generated log files will be stored. Overrides the
+**LOGDEST=**"/path/to/directory"::
+ Directory where generated log files will be stored. Overrides the
corresponding value defined in linkman:makepkg.conf[5].
**PACKAGER=**"John Doe <john@doe.com>"::
String to identify the creator of the resulting package. Overrides
the corresponding value defined in linkman:makepkg.conf[5].
-**BUILDDIR=**"/path/to/folder"::
- Folder where the package will be built. Overrides the corresponding
+**BUILDDIR=**"/path/to/directory"::
+ Directory where the package will be built. Overrides the corresponding
value defined in linkman:makepkg.conf[5].
**CARCH=**"(i686|x86_64)"::
@@ -252,8 +252,8 @@ Environment Variables
Sets the compression used when making compiled or source packages.
Overrides the corresponding value defined in linkman:makepkg.conf[5].
-**GNUPGHOME=**"/path/to/folder"::
- Folder where the gpg keyring for signing the built package is stored.
+**GNUPGHOME=**"/path/to/directory"::
+ Directory where the gpg keyring for signing the built package is stored.
**GPGKEY=**"keyid"::
Specify a key to use when signing packages, overriding the GPGKEY setting
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index ef64d17c..e85a8e99 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -126,10 +126,10 @@ Options
running in the DistCC cluster. In addition, you will want to modify your
`MAKEFLAGS`.
-**BUILDDIR=**"/path/to/folder"::
+**BUILDDIR=**"/path/to/directory"::
If this value is not set, packages will by default be built in
subdirectories of the directory that makepkg is called from. This
- option allows setting the build location to another folder.
+ option allows setting the build location to another directory.
Incorrect use of `$startdir` in a PKGBUILD may cause building with
this option to fail.
@@ -219,23 +219,23 @@ Options
instruct makepkg which files to remove from the package. This is
useful for index files that are added by multiple packages.
-**PKGDEST=**"/path/to/folder"::
+**PKGDEST=**"/path/to/directory"::
If this value is not set, packages will by default be placed in the
current directory (location of the linkman:PKGBUILD[5]). Many people
like to keep all their packages in one place so this option allows
this behavior. A common location is ``/home/packages''.
-**SRCDEST=**"/path/to/folder"::
+**SRCDEST=**"/path/to/directory"::
If this value is not set, downloaded source files will only be stored
in the current directory. Many people like to keep all source files in
a central location for easy cleanup, so this path can be set here.
-**SRCPKGDEST=**"/path/to/folder"::
+**SRCPKGDEST=**"/path/to/directory"::
If this value is not set, source package files will be stored in
in the current directory. Many people like to keep all source package files
in a central location for easy cleanup, so this path can be set here.
-**LOGDEST=**"/path/to/folder"::
+**LOGDEST=**"/path/to/directory"::
If this value is not set, log files are written to the current
directory. This centralizes the log location, facilitating cleanup
and compression.
diff --git a/scripts/library/README b/scripts/library/README
index 9e2b6a14..e9615a2e 100644
--- a/scripts/library/README
+++ b/scripts/library/README
@@ -1,4 +1,4 @@
-This folder contains code snippets that can be reused by multiple
+This directory contains code snippets that can be reused by multiple
scripts. A brief description of each file follows.
output_format.sh: