Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/alpm.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-02-13 10:12:39 -0600
committerDan McGee <dan@archlinux.org>2012-02-13 10:14:06 -0600
commitc7321a7b80aebeacb05ad5ab9d096779403b1758 (patch)
tree8fa7f16abc7b7af0c24ba92ababfc5c145d35eed /lib/libalpm/alpm.h
parent115c0381c235100d7b05d9751767017a9ee325c4 (diff)
parentb4f5a63e7fee5d04949e290bd63e5f0e94bd211e (diff)
Merge branch 'maint'
Conflicts: lib/libalpm/sync.c src/util/pactree.c
Diffstat (limited to 'lib/libalpm/alpm.h')
-rw-r--r--lib/libalpm/alpm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index ca650928..aeb1bb72 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -309,7 +309,7 @@ typedef enum _alpm_event_t {
ALPM_EVENT_LOAD_START,
/** Target package is finished loading. */
ALPM_EVENT_LOAD_DONE,
- /** Target deltas's integrity will be checked. */
+ /** Target delta's integrity will be checked. */
ALPM_EVENT_DELTA_INTEGRITY_START,
/** Target delta's integrity was checked. */
ALPM_EVENT_DELTA_INTEGRITY_DONE,
@@ -873,7 +873,7 @@ alpm_list_t *alpm_pkg_get_backup(alpm_pkg_t *pkg);
*/
alpm_db_t *alpm_pkg_get_db(alpm_pkg_t *pkg);
-/** Retuns the base64 encoded package signature.
+/** Returns the base64 encoded package signature.
* @param pkg a pointer to package
* @return a reference to an internal string
*/
@@ -1034,7 +1034,7 @@ int alpm_trans_prepare(alpm_handle_t *handle, alpm_list_t **data);
/** Commit a transaction.
* @param handle the context handle
* @param data the address of an alpm_list where detailed description
- * of an error can be dumped (ie. list of conflicting files)
+ * of an error can be dumped (i.e. list of conflicting files)
* @return 0 on success, -1 on error (pm_errno is set accordingly)
*/
int alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data);