Merge branch 'maint'

8 files changed, 18 insertions, 15 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index def58c4e..bc0244c2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -92,9 +92,9 @@ html: $(HTML_DOCS)
 website: html
 	bsdtar czf website.tar.gz $(HTML_DOCS) \
 		-C /etc/asciidoc/stylesheets/ \
-		xhtml11.css xhtml11-manpage.css xhtml11-quirks.css \
+		asciidoc.css asciidoc-manpage.css \
 		-C /etc/asciidoc/javascripts/ \
-		asciidoc-xhtml11.js \
+		asciidoc.js \
 		-C /etc/asciidoc/ \
 		images
 
diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf
index 3ea510d8..e2e72672 100644
--- a/doc/asciidoc.conf
+++ b/doc/asciidoc.conf
@@ -17,7 +17,11 @@ plus=+
 caret=^
 startsb=[
 endsb=]
+backslash=\
 tilde=~
+apostrophe='
+backtick=`
+litdd=--
 
 ifdef::backend-docbook[]
 [linkman-inlinemacro]
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index 1a2dcd04..e61f7ab3 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -53,7 +53,7 @@ Options
 	in linkman:makepkg.conf[5].
 
 *\--config* <file>::
-	Use an alternate config file instead of the `{sysconfdir}/makepkg.conf`
+	Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+
 	default.
 
 *-d, \--nodeps*::
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 3b92d193..531c992a 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -117,7 +117,7 @@ Options
 -------
 *-b, \--dbpath* <path>::
 	Specify an alternative database location (a typical default is
-	`{localstatedir}/lib/pacman`). This should not be used unless you know what you are
+	+{localstatedir}/lib/pacman+). This should not be used unless you know what you are
 	doing. *NOTE*: if specified, this is an absolute path and the root path is
 	not automatically prepended.
 
@@ -138,7 +138,7 @@ Options
 
 *\--cachedir* <dir>::
 	Specify an alternative package cache location (a typical default is
-	`{localstatedir}/cache/pacman/pkg`). Multiple cache directories can be specified,
+	+{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be specified,
 	and they are tried in the order they are passed to pacman. *NOTE*: this
 	is an absolute path, the root path is not automatically prepended.
 
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 99fb0fa4..70d42eb3 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -35,7 +35,7 @@ NoUpgrade = etc/passwd etc/group etc/shadow
 NoUpgrade = etc/fstab
 
 [core]
-Include = {sysconfdir}/pacman.d/core
+Include = /etc/pacman.d/core
 
 [custom]
 Server = file:///home/pkgs
@@ -57,13 +57,13 @@ Options
 
 *DBPath =* path/to/db/dir::
 	Overrides the default location of the toplevel database directory.  A
-	typical default is `{localstatedir}/lib/pacman/`. Most users will not need to set
+	typical default is +{localstatedir}/lib/pacman/+. Most users will not need to set
 	this option. *NOTE*: if specified, this is an absolute path and the root
 	path is not automatically prepended.
 
 *CacheDir =* path/to/cache/dir::
 	Overrides the default location of the package cache directory. A typical
-	default is `{localstatedir}/cache/pacman/pkg/`. Multiple cache directories can be
+	default is +{localstatedir}/cache/pacman/pkg/+. Multiple cache directories can be
 	specified, and they are tried in the order they are listed in the config
 	file. If a file is not found in any cache directory, it will be downloaded
 	to the first cache directory with write access. *NOTE*: this is an absolute
@@ -81,7 +81,7 @@ Options
 
 *LogFile =* '/path/to/file'::
 	Overrides the default location of the pacman log file. A typical default
-	is `{localstatedir}/log/pacman.log`. This is an absolute path and the root directory
+	is +{localstatedir}/log/pacman.log+. This is an absolute path and the root directory
 	is not prepended.
 
 *HoldPkg =* package ...::
@@ -158,7 +158,7 @@ Options
 
 *UseSyslog*::
 	Log action messages through syslog(). This will insert log entries into
-	`{localstatedir}/log/messages` or equivalent.
+	+{localstatedir}/log/messages+ or equivalent.
 
 *UseDelta*::
 	Download delta files instead of complete packages if possible.  Requires
@@ -225,7 +225,7 @@ directory with these packages so pacman can find it when run with '\--refresh'.
 
 The above command will generate a compressed database named
 '/home/pkgs/custom.db.tar.gz'. Note that the database must be of the form
-'{treename}.db.tar.gz', where '{treename}' is the name of the section defined in
+'\{treename\}.db.tar.gz', where '\{treename\}' is the name of the section defined in
 the configuration file. That's it! Now configure your custom section in the
 configuration file as shown in the config example above. Pacman will now use your
 package repository. If you add new packages to the repository, remember to
diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c
index d2e09478..c2b30adc 100644
--- a/lib/libalpm/alpm_list.c
+++ b/lib/libalpm/alpm_list.c
@@ -286,7 +286,7 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn
 
 /**
  * @brief Remove an item from the list.
- * item is not freed; this is the responsiblity of the caller.
+ * item is not freed; this is the responsibility of the caller.
  *
  * @param haystack the list to remove the item from
  * @param item the item to remove from the list
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 2d6766a5..39b3b600 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -44,8 +44,6 @@ pmhandle_t *_alpm_handle_new()
 {
 	pmhandle_t *handle;
 
-	ALPM_LOG_FUNC;
-
 	CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
 	handle->sigverify = PM_PGP_VERIFY_OPTIONAL;
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index af1bccee..5ffb5df2 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -54,6 +54,8 @@ static int make_lock(pmhandle_t *handle)
 	int fd;
 	char *dir, *ptr;
 
+	ASSERT(handle->lockfile != NULL, return -1);
+
 	/* create the dir of the lockfile first */
 	dir = strdup(handle->lockfile);
 	ptr = strrchr(dir, '/');
@@ -106,7 +108,6 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
 
 	/* Sanity checks */
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-
 	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
 
 	/* lock db */