Skip to content

Use newer name for Mac OS X/OS X -> macOS #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RSS Guard

### [Discord server](https://discord.gg/7xbVMPPNqH) | [Downloads](https://github.com/martinrotter/rssguard/releases) | [Development builds](https://github.com/martinrotter/rssguard/releases/tag/devbuild) | [Documentation](https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md)

RSS Guard is simple RSS/ATOM feed reader for Windows, Linux or Mac OS X which can work with RSS/ATOM/JSON and also supports many online RSS services:
RSS Guard is simple RSS/ATOM feed reader for Windows, Linux or macOS which can work with RSS/ATOM/JSON and also supports many online RSS services:
* [Tiny Tiny RSS](https://tt-rss.org),
* [Inoreader](https://www.inoreader.com) (via Google Reader API plugin),
* [Nextcloud News](https://apps.nextcloud.com/apps/news),
Expand Down
2 changes: 1 addition & 1 deletion build.pro
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# {FEEDLY,GMAIL,INOREADER}_CLIENT_SECRET - preconfigured OAuth cliend SECRET.
#
# Other information:
# - supports Windows, Linux, Mac OS X, OS/2, Android,
# - supports Windows, Linux, macOS, OS/2, Android,
# - Qt 5.9.0 or higher is required,
# - if you wish to make packages for Windows, then you must initialize all submodules within repository before compilation,
# - C++ 11/17 is required.
Expand Down
2 changes: 1 addition & 1 deletion resources/docs/Documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ Binary name (interpreter) must be always be specified, while arguments not. Be v

<img alt="alt-img" src="images/scrape-source.png" width="350px">

Note that the above examples are cross-platform and you can use the exact same command on Windows, Linux or Mac OS X, if your operating system is properly configured.
Note that the above examples are cross-platform and you can use the exact same command on Windows, Linux or macOS, if your operating system is properly configured.

RSS Guard offers [placeholder](#userd-plac) `%data%` which is automatically replaced with full path to RSS Guard's [user data folder](#userd), allowing you to make your configuration fully portable. You can, therefore, use something like this as source script line: `bash#%data%/scripts/download-feed.sh`.

Expand Down
2 changes: 1 addition & 1 deletion resources/scripts/github-actions/build-linux-mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [[ "$os" == *"ubuntu"* ]]; then
echo "We are building for GNU/Linux on Ubuntu."
is_linux=true
else
echo "We are building for Mac OS X."
echo "We are building for macOS."
is_linux=false
fi

Expand Down
2 changes: 1 addition & 1 deletion src/librssguard/definitions/definitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
#elif defined(Q_OS_OS2)
#define OS_ID "OS/2"
#elif defined(Q_OS_OSX)
#define OS_ID "Mac OS X"
#define OS_ID "macOS"
#elif defined(Q_OS_WIN)
#define OS_ID "Windows"
#elif defined(Q_OS_ANDROID)
Expand Down
2 changes: 1 addition & 1 deletion src/rssguard/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int main(int argc, char* argv[]) {
QApplication::setDesktopFileName(APP_DESKTOP_ENTRY_FILE);
#endif

// Ensure that ini format is used as application settings storage on Mac OS.
// Ensure that ini format is used as application settings storage on macOS.
QSettings::setDefaultFormat(QSettings::IniFormat);

#if defined(Q_OS_MACOS)
Expand Down