Merge branch 'master' into core-updates

1 files changed, 5 insertions, 4 deletions

diff --git a/guix/build/dub-build-system.scm b/guix/build/dub-build-system.scm
index 432d51f6a7..ed86635708 100644
--- a/guix/build/dub-build-system.scm
+++ b/guix/build/dub-build-system.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -69,14 +70,14 @@
     (zero? (system* "dub" "add-path" vendor-dir))))
 
 (define (grep string file-name)
-  "Find the first occurence of STRING in the file named FILE-NAME.
-   Return the position of this occurence, or #f if none was found."
+  "Find the first occurrence of STRING in the file named FILE-NAME.
+   Return the position of this occurrence, or #f if none was found."
   (string-contains (call-with-input-file file-name get-string-all)
                    string))
 
 (define (grep* string file-name)
-  "Find the first occurence of STRING in the file named FILE-NAME.
-   Return the position of this occurence, or #f if none was found.
+  "Find the first occurrence of STRING in the file named FILE-NAME.
+   Return the position of this occurrence, or #f if none was found.
    If the file named FILE-NAME doesn't exist, return #f."
   (catch 'system-error
     (lambda ()