From 7752434d119fc282a70144c32b267e8787cbd07a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Thu, 9 Jul 2020 11:06:04 -0400 Subject: [PATCH] Docs: Use current spelling for macOS (#26181) --- contribute/developer-guide.md | 2 +- docs/sources/administration/configuration.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contribute/developer-guide.md b/contribute/developer-guide.md index 804221548ea..a3b5b5d1f7b 100644 --- a/contribute/developer-guide.md +++ b/contribute/developer-guide.md @@ -184,7 +184,7 @@ Are you having issues with setting up your environment? Here are some tips that ### Too many open files when running `make run` -Depending on your environment, you may have to increase the maximum number of open files allowed. For the rest of this section, we will assume you are on a Unix like OS (e.g. Linux/MacOS), where you can control the maximum number of open files through the [ulimit](https://ss64.com/bash/ulimit.html) shell command. +Depending on your environment, you may have to increase the maximum number of open files allowed. For the rest of this section, we will assume you are on a Unix like OS (e.g. Linux/macOS), where you can control the maximum number of open files through the [ulimit](https://ss64.com/bash/ulimit.html) shell command. To see how many open files are allowed, run: diff --git a/docs/sources/administration/configuration.md b/docs/sources/administration/configuration.md index cb39c77b4e2..d2d246d98a2 100644 --- a/docs/sources/administration/configuration.md +++ b/docs/sources/administration/configuration.md @@ -37,7 +37,7 @@ Refer to [Configure a Grafana Docker image]({{< relref "../installation/configur `sample.ini` is in the same directory as `defaults.ini` and contains all the settings commented out. Copy `sample.ini` and name it `custom.ini`. -### MacOS +### macOS By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. To configure Grafana, add a configuration file named `custom.ini` to the `conf` folder to override any of the settings defined in `conf/defaults.ini`.