From 5f46805ec696ac9dee1da4ecb36f4966c7fc17de Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Sat, 14 Sep 2019 01:01:17 +0100
Subject: Fix typo

---
 doc/stdenv.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 16003fb4acf..f8c2aff9785 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2411,7 +2411,7 @@ addEnvHooks "$hostOffset" myBashFunction
       <para>
        The Bintools Wrapper was only just recently split off from CC Wrapper,
        so the division of labor is still being worked out. For example, it
-       shouldn't care about about the C standard library, but just take a
+       shouldn't care about the C standard library, but just take a
        derivation with the dynamic loader (which happens to be the glibc on
        linux). Dependency finding however is a task both wrappers will continue
        to need to share, and probably the most important to understand. It is
-- 
cgit v1.2.3


From e5e6b514f5d4ec28a29e8a8489cb5c55101b4654 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 14 Sep 2019 11:11:30 +0100
Subject: citrix-receiver: decomission in favor of citrix-workspace.

Already documented in #64645
---
 doc/package-specific-user-notes.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml
index a176f4d1395..ef23b022c88 100644
--- a/doc/package-specific-user-notes.xml
+++ b/doc/package-specific-user-notes.xml
@@ -416,7 +416,7 @@ overrides = self: super: rec {
     <para>
      Please note that the <literal>citrix_receiver</literal> package has been deprecated since its
      development was <link xlink:href="https://docs.citrix.com/en-us/citrix-workspace-app.html">discontinued by upstream</link>
-     and will be replaced by <link xlink:href="https://www.citrix.com/products/workspace-app/">the citrix workspace app</link>.
+     and has been replaced by <link xlink:href="https://www.citrix.com/products/workspace-app/">the citrix workspace app</link>.
     </para>
    </note>
    <link xlink:href="https://www.citrix.com/products/receiver/">Citrix Receiver</link> and
@@ -458,7 +458,7 @@ overrides = self: super: rec {
    <title>Custom certificates</title>
 
    <para>
-    The <literal>Citrix Receiver</literal> and <literal>Citrix Workspace App</literal>
+    The <literal>Citrix Workspace App</literal>
     in <literal>nixpkgs</literal> trust several certificates
     <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the
     Mozilla database</link> by default. However several companies using Citrix
@@ -472,7 +472,7 @@ overrides = self: super: rec {
 <programlisting>
 <![CDATA[with import <nixpkgs> { config.allowUnfree = true; };
 let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in
-citrix_workspace.override { # the same applies for `citrix_receiver` if used.
+citrix_workspace.override {
   inherit extraCerts;
 }]]>
 </programlisting>
-- 
cgit v1.2.3