From 144ccbf809614573b990ae480cdc93279258e401 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sun, 21 Sep 2014 00:55:23 +0400 Subject: [PATCH] Make order of configuration file loading clear. --- man/aptly.1 | 2 +- man/aptly.1.ronn.tmpl | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/man/aptly.1 b/man/aptly.1 index 73d593ea..c7bbb913 100644 --- a/man/aptly.1 +++ b/man/aptly.1 @@ -25,7 +25,7 @@ aptly is a tool to create partial and full mirrors of remote repositories, manag aptly\(cqs goal is to establish repeatability and controlled changes in a package\-centric environment\. aptly allows one to fix a set of packages in a repository, so that package installation and upgrade becomes deterministic\. At the same time aptly allows one to perform controlled, fine\-grained changes in repository contents to transition your package environment to new version\. . .SH "CONFIGURATION" -aptly looks for configuration file in \fB/etc/aptly\.conf\fR and \fB~/\.aptly\.conf\fR, if no config file found, new one is created\. If \fB\-config=\fR flag is specified, aptly would use config file at specified location\. Also aptly needs root directory for database, package and published repository storage\. If not specified, directory defaults to \fB~/\.aptly\fR, it will be created if missing\. +aptly looks for configuration file first in \fB~/\.aptly\.conf\fR then in \fB/etc/aptly\.conf\fR and, if no config file found, new one is created in home directory\. If \fB\-config=\fR flag is specified, aptly would use config file at specified location\. Also aptly needs root directory for database, package and published repository storage\. If not specified, directory defaults to \fB~/\.aptly\fR, it will be created if missing\. . .P Configuration file is stored in JSON format (default values shown below): diff --git a/man/aptly.1.ronn.tmpl b/man/aptly.1.ronn.tmpl index 4232e76e..37eb052e 100644 --- a/man/aptly.1.ronn.tmpl +++ b/man/aptly.1.ronn.tmpl @@ -18,8 +18,9 @@ aptly has integrated help that matches contents of this manual page, to get help ## CONFIGURATION -aptly looks for configuration file in `/etc/aptly.conf` and `~/.aptly.conf`, if no config file -found, new one is created. If `-config=` flag is specified, aptly would use config file at specified +aptly looks for configuration file first in `~/.aptly.conf` then +in `/etc/aptly.conf` and, if no config file found, new one is created in +home directory. If `-config=` flag is specified, aptly would use config file at specified location. Also aptly needs root directory for database, package and published repository storage. If not specified, directory defaults to `~/.aptly`, it will be created if missing.