From nix-commits  Wed Jun 21 20:25:59 2017
From: Ambroz Bizjak <ambrop7 () gmail ! com>
Date: Wed, 21 Jun 2017 20:25:59 +0000
To: nix-commits
Subject: [Nix-commits] [NixOS/nixpkgs] eb2ce8: doc: Fix some typos
Message-Id: <594ad657e438d_137363f8b09dedc34836c8 () hookshot-fe-6dbb0c4 ! cp1-iad ! github ! net ! mail>
X-MARC-Message: https://marc.info/?l=nix-commits&m=149807676925853
MIME-Version: 1
Content-Type: multipart/mixed; boundary="----==_mimepart_594ad657e4086_137363f8b09dedc34835d4"


----==_mimepart_594ad657e4086_137363f8b09dedc34835d4
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit

  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: eb2ce870a9d35870f7679f0abb1cb0450442109e
      https://github.com/NixOS/nixpkgs/commit/eb2ce870a9d35870f7679f0abb1cb0450442109e
  Author: Jan Tojnar <jtojnar@gmail.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M doc/configuration.xml
    M doc/functions.xml
    M doc/overlays.xml
    M doc/reviewing-contributions.xml
    M doc/stdenv.xml
    M nixos/doc/manual/administration/imperative-containers.xml
    M nixos/doc/manual/development/option-declarations.xml
    M nixos/doc/manual/development/option-types.xml
    M nixos/doc/manual/release-notes/rl-1509.xml
    M nixos/doc/manual/release-notes/rl-1603.xml

  Log Message:
  -----------
  doc: Fix some typos

(cherry picked from commit e35f3c0679cafb8de84274433159e1b393dca46d)


  Commit: f827d499a1ff33a60a30d3daf4447f3d158cf1f2
      https://github.com/NixOS/nixpkgs/commit/f827d499a1ff33a60a30d3daf4447f3d158cf1f2
  Author: Ambroz Bizjak <ambrop7@gmail.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M pkgs/applications/editors/kdevelop5/kdevelop.nix
    M pkgs/applications/editors/kdevelop5/kdevplatform.nix

  Log Message:
  -----------
  kdevelop: 5.0.4 -> 5.1.1

Including also a patch for bug https://bugs.kde.org/show_bug.cgi?id=379433
which is a quite annoying regression from 5.0.4. The patch is the same as
the change committed upstream.

(cherry picked from commit 8f4619bb3d5229cc4fd0734d9a6aac19e923571a)


Compare: https://github.com/NixOS/nixpkgs/compare/2b31e72a9cdb...f827d499a1ff
----==_mimepart_594ad657e4086_137363f8b09dedc34835d4
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
nix-commits mailing list
nix-commits@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

----==_mimepart_594ad657e4086_137363f8b09dedc34835d4--