From a3565a9d18b1dbb345228675b5b881811179216e Mon Sep 17 00:00:00 2001 From: Katherine Kinnaman Date: Fri, 5 Apr 2024 16:37:17 -0500 Subject: [PATCH 1/5] Free support rewrite and link fixes --- docs/source/help-support.rst | 129 +++++++++++------------------------ 1 file changed, 41 insertions(+), 88 deletions(-) diff --git a/docs/source/help-support.rst b/docs/source/help-support.rst index 69650c687..9b73beb47 100644 --- a/docs/source/help-support.rst +++ b/docs/source/help-support.rst @@ -1,35 +1,51 @@ -================= +================ Help and support -================= +================ -* Get free community support with our `Google group - `_. +Free community support +====================== -* Paid `support `_, - `training `_ and - `consulting `_ - options are available. Our teaching philosophy is that the best - way to learn is with hands-on experience addressing real-world - problems. Courses are available to individuals online, at - numerous sites, or in-house at your place of business. We also - offer consulting services for the analysis, management and - visualization of scientific and business data or optimizing - your processing workflows on modern hardware and GPUs. +Ask and answer questions, discuss ways to use conda, +request new features, and submit any other comments you might have. -* Support is included in purchases of `Anaconda Enterprise - `_. +.. grid:: 1 2 2 2 + .. grid-item:: -Join the conda email group -=========================== + .. card:: Conda community forum + :link: https://conda.discourse.group/ -Join the mailing lists for both `Anaconda -`_ -and `conda -`_. -Ask questions, answer questions, discuss ways to use conda, -request new features and submit any other comments you may have. + Join our Discourse forum for conda discussion and news + .. grid-item:: + + .. card:: Conda Matrix chat + :link: https://matrix.to/#/#conda:matrix.org + + Chat about conda issues and projects with other users + + .. grid-item:: + + .. card:: Anaconda community forum + :link: https://community.anaconda.cloud/ + + Ask and answer questions about Anaconda's products + +Paid support +============ + +Paid `support `_, +`courses `_, and +`consulting `_ +options are available. Our teaching philosophy is that the best +way to learn is with hands-on experience addressing real-world +problems. Courses are available to individuals online, at +numerous sites, or in-house at your place of business. We also +offer consulting services for the analysis, management and +visualization of scientific and business data or optimizing +your processing workflows on modern hardware and GPUs. + +Support is included in purchases of `Anaconda's Enterprise tier `_. Contribute recipes to GitHub ============================ @@ -50,9 +66,8 @@ Feedstocks are welcome for programs that use any license, such as GPL, BSD, MIT or Apache, and all of the recipes the conda-forge and bioconda repositories are released into the public domain. - Report bugs -============== +=========== If you find a bug, search to see if it has already been reported, and then report it if no one else has. @@ -63,65 +78,3 @@ https://github.com/conda/conda-docs/issues. For issues with conda, conda-build, repo.anaconda.com, anaconda.org, and specific conda packages, please see :ref:`new-issues`. -Presentations and blog posts -============================ - -* `Packaging and Deployment with conda---Travis Oliphant - `_. - -* `Anaconda Developer Blog `_. - - -Conda announcements list -======================== - -Conda Announcements is a low-traffic email list for news and -updates directly from the conda core team. By providing your -email address below, you consent to join Conda Announcements. It -is not a marketing list. We never sell, give away or distribute -your email address to third parties. - -* No more than 1 email per week, usually less. -* Project announcements relevant to all conda users. -* No corporate marketing hype. -* No spam. - -For convenience, we use MailChimp to manage subscriptions, -including `archived announcements -`_. - -Upon clicking the "Consent and Subscribe" button, you will receive an email that -contains a link to confirm your subscription. You must click this link to activate -your subscription. You can opt-out at any time by clicking the "Unsubscribe" link -included in any email we send through this announcement list, or by contacting -privacy@anaconda.com. - -.. raw:: html - - - - -
-
-
-
* indicates required
-
- - -
-
- - -
- -
-
-
-
- - From 325d7f1da46d280da4cb611d58489089f13df91b Mon Sep 17 00:00:00 2001 From: Katherine Kinnaman Date: Fri, 12 Apr 2024 17:39:34 -0500 Subject: [PATCH 2/5] Updating the Help and Support page --- docs/source/help-support.rst | 58 +++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/docs/source/help-support.rst b/docs/source/help-support.rst index 9b73beb47..a4cb90984 100644 --- a/docs/source/help-support.rst +++ b/docs/source/help-support.rst @@ -34,18 +34,16 @@ request new features, and submit any other comments you might have. Paid support ============ -Paid `support `_, -`courses `_, and -`consulting `_ -options are available. Our teaching philosophy is that the best -way to learn is with hands-on experience addressing real-world -problems. Courses are available to individuals online, at -numerous sites, or in-house at your place of business. We also -offer consulting services for the analysis, management and -visualization of scientific and business data or optimizing -your processing workflows on modern hardware and GPUs. - -Support is included in purchases of `Anaconda's Enterprise tier `_. +The conda organization does not directly offer paid support, training, or +consultation on conda package management or creation. However, this section +lists organizations that do provide such services. If your organization would +like to be added to this list, please open a pull request against the conda-docs repository. + +Anaconda +-------- + +See Anaconda's `Help and Support page `_ +for information on its paid support and consultation programs. Contribute recipes to GitHub ============================ @@ -63,18 +61,36 @@ feedstocks, submit them to `conda-forge `_ with a pull request. Feedstocks are welcome for programs that use any license, such as GPL, -BSD, MIT or Apache, and all of the recipes the conda-forge and -bioconda repositories are released into the public domain. - -Report bugs -=========== - -If you find a bug, search to see if it has already been reported, +BSD, MIT or Apache, and all of the rt has already been reported, and then report it if no one else has. Issues with the conda documentation are tracked on GitHub at https://github.com/conda/conda-docs/issues. -For issues with conda, conda-build, repo.anaconda.com, anaconda.org, -and specific conda packages, please see :ref:`new-issues`. +.. note:: + + The conda-docs repository includes documentation that is common for conda + and conda-build, as well as landing pages for those projects. + + The documentation for conda, conda-build, and other conda-related + projects can be found in their respective repositories. + + To create issues for conda, conda-build, repo.anaconda.com, anaconda.org, + and specific conda packages, please see the individual repo + links in the :ref:`New issues ` section of the Contributing guide. + +Conda Announce mailing list +=========================== + +Conda Announce (`announce@lists.conda.org `_) +is a low-traffic email list for news and +updates directly from the conda core team. It +is not a marketing list. We never sell, give away, or distribute +your email address to third parties. + +* No more than 1 email per week, usually less. +* Project announcements relevant to all conda users. +* No corporate marketing hype. +* No spam. +Subscribe `here `__. From e8ca63c718ad692e1f97577a3fd4d0c8ba913609 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 22:46:52 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/source/help-support.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/help-support.rst b/docs/source/help-support.rst index a4cb90984..060b83b5d 100644 --- a/docs/source/help-support.rst +++ b/docs/source/help-support.rst @@ -34,15 +34,15 @@ request new features, and submit any other comments you might have. Paid support ============ -The conda organization does not directly offer paid support, training, or -consultation on conda package management or creation. However, this section -lists organizations that do provide such services. If your organization would +The conda organization does not directly offer paid support, training, or +consultation on conda package management or creation. However, this section +lists organizations that do provide such services. If your organization would like to be added to this list, please open a pull request against the conda-docs repository. Anaconda -------- -See Anaconda's `Help and Support page `_ +See Anaconda's `Help and Support page `_ for information on its paid support and consultation programs. Contribute recipes to GitHub @@ -67,8 +67,8 @@ and then report it if no one else has. Issues with the conda documentation are tracked on GitHub at https://github.com/conda/conda-docs/issues. -.. note:: - +.. note:: + The conda-docs repository includes documentation that is common for conda and conda-build, as well as landing pages for those projects. @@ -76,13 +76,13 @@ https://github.com/conda/conda-docs/issues. projects can be found in their respective repositories. To create issues for conda, conda-build, repo.anaconda.com, anaconda.org, - and specific conda packages, please see the individual repo + and specific conda packages, please see the individual repo links in the :ref:`New issues ` section of the Contributing guide. Conda Announce mailing list =========================== -Conda Announce (`announce@lists.conda.org `_) +Conda Announce (`announce@lists.conda.org `_) is a low-traffic email list for news and updates directly from the conda core team. It is not a marketing list. We never sell, give away, or distribute From c8871e85ec2d1e7939fb74769140cf40f3d7a63e Mon Sep 17 00:00:00 2001 From: Katherine Kinnaman Date: Fri, 19 Apr 2024 09:40:41 -0500 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: Travis Hathaway --- docs/source/help-support.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/help-support.rst b/docs/source/help-support.rst index 060b83b5d..44e48c26a 100644 --- a/docs/source/help-support.rst +++ b/docs/source/help-support.rst @@ -2,10 +2,10 @@ Help and support ================ -Free community support +Community support ====================== -Ask and answer questions, discuss ways to use conda, +Use the following tools to ask and answer questions, discuss ways to use conda, request new features, and submit any other comments you might have. .. grid:: 1 2 2 2 From 950ec4a4e505208063e38e7adc1fe7773589619e Mon Sep 17 00:00:00 2001 From: Katherine Kinnaman Date: Tue, 23 Apr 2024 09:30:41 -0500 Subject: [PATCH 5/5] Update docs/source/help-support.rst Co-authored-by: Bianca Henderson --- docs/source/help-support.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/help-support.rst b/docs/source/help-support.rst index 44e48c26a..8fd8de76e 100644 --- a/docs/source/help-support.rst +++ b/docs/source/help-support.rst @@ -37,7 +37,7 @@ Paid support The conda organization does not directly offer paid support, training, or consultation on conda package management or creation. However, this section lists organizations that do provide such services. If your organization would -like to be added to this list, please open a pull request against the conda-docs repository. +like to be added to this list, please open a pull request against the `conda-docs repository `_. Anaconda --------