This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 21afa328 Fix brand name for `macOS` (#184)
21afa328 is described below
commit 21afa328f3641905017609bb8f29d4324fbcbe1e
Author: John Bampton <[email protected]>
AuthorDate: Sun Feb 12 18:12:02 2023 +1000
Fix brand name for `macOS` (#184)
* Fix brand name for `macOS`
Rename file
* Fix up
---
CONFIGURE.md | 2 +-
DEVELOPMENT.md | 10 +++++-----
DOCKER.md | 4 ++--
MACOSX.md => MACOS.md | 18 +++++++++---------
README.md | 2 +-
SETUPMYMAC.md | 4 ++--
config/secretary-workbench.md | 2 +-
config/setupmymac | 2 +-
lib/spec/lib/svn_wunderbar_spec.rb | 2 +-
lib/whimsy/asf/ldap.rb | 2 +-
www/board/agenda/README.md | 6 +++---
www/docs/index.cgi | 2 +-
www/secretary/workbench/README | 2 +-
www/secretary/workbench/public/HOWTO.html | 6 +++---
14 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/CONFIGURE.md b/CONFIGURE.md
index 03f8a308..1c7cde61 100644
--- a/CONFIGURE.md
+++ b/CONFIGURE.md
@@ -42,7 +42,7 @@ Whimsy can be run on a client or in a local container for
development use.
* **Log files and debugging** are typically found in
`/var/log/apache2/whimsy_error.log`
and `/var/log/apache2/error_log`
-* **Development setup instructions** are in [DEVELOPMENT.md](DEVELOPMENT.md)
and [MACOSX.md](MACOSX.md).
+* **Development setup instructions** are in [DEVELOPMENT.md](DEVELOPMENT.md)
and [MACOS.md](MACOS.md).
* **whimsy-asf Gem** is a set of the core lib/whimsy/asf model as a normal
Gem: [asf.gemspec](asf.gemspec)
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index b26a0174..6533708c 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -70,7 +70,7 @@ Setup Whimsy Locally
This section is for those desiring to run a whimsy tool on their own machine.
[See below for deploying](#advanced-configuration) in a Docker container or a
Vagrant VM,
-or read the [detailed MACOSX setup steps](MACOSX.md).
+or read the [detailed macOS setup steps](MACOS.md).
1. **Setup ruby 2.3.x or higher.** Verify with `ruby -v`.
If you use a system provided version of Ruby, you may need to prefix
@@ -92,7 +92,7 @@ or read the [detailed MACOSX setup steps](MACOSX.md).
`gem install bundler` (mail and listen may be needed too)
- - If you're using [Mac OS El Capitan or higher](MACOSX.md), you may need to
do this:
+ - If you're using [macOS El Capitan or higher](MACOS.md), you may need to
do this:
`sudo gem install bundler -n /usr/local/bin`
@@ -135,7 +135,7 @@ or read the [detailed MACOSX setup steps](MACOSX.md).
If multiple different certificates are needed, they should all be added
to the same file.
[The option `TLS_CACERTDIR` is not used Ubuntu for example]
- N.B. OpenLDAP on Mac OS/X uses `/etc/openldap/` instead of `/etc/ldap/`
+ N.B. OpenLDAP on macOS uses `/etc/openldap/` instead of `/etc/ldap/`
Adjust the paths above as necessary.
Also (on Catalina at least), macOS uses SecureTransport.
This means that `TLS_CACERT` is not used.
@@ -252,7 +252,7 @@ a virtual host, complete with authentication:
Enable the modules you need using `a2ensite`. Restart the Apache httpd
web server using `service apache2 restart`.
- b. [On Mac OS/X](MACOSX.md), place the generated vhost definition into
+ b. [On macOS](MACOS.md), place the generated vhost definition into
`/private/etc/apache2/extra/httpd-vhosts.conf`. Edit
`/etc/apache2/httpd.conf` and uncomment out the line that includes
`httpd-vhosts.conf`, and
@@ -295,7 +295,7 @@ different ways to document code or functionality for users.
processes and other websites are described in
[test/dataflow.cgi](https://whimsy.apache.org/test/dataflow.cgi)
- **How-To for whimsy committers** are what you're reading right here
- in DEVELOPMENT.md and in DEPLOYMENT.md, CONFIGURE.md, MACOSX.md
+ in DEVELOPMENT.md and in DEPLOYMENT.md, CONFIGURE.md, MACOS.md
How To / FAQ :question:
diff --git a/DOCKER.md b/DOCKER.md
index d4f9b6ef..86b57373 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -1,7 +1,7 @@
Docker execution instructions
=============================
-:dizzy: **New!** For a simpler way to setup a Mac OSX machine, please
+:dizzy: **New!** For a simpler way to setup a macOS machine, please
check out the [setupmymac script](./SETUPMYMAC.md), which automates
configuring and keeping updated a local whimsy instance with Docker.
@@ -50,7 +50,7 @@ Installation instructions
* Create an empty directory. Note: while you _can_ use an existing clone of
Whimsy (and in particular, you _may_ be able to use the `/srv` directories
- defined by the [macOS](MACOSX.md) instructions), be aware of the following:
+ defined by the [macOS](MACOS.md) instructions), be aware of the following:
* Files in the parent directory of the Whimsy clone may be created,
overwritten, or deleted by this process.
* The `svn` and `git` sub-directories cannot be links to another part of
diff --git a/MACOSX.md b/MACOS.md
similarity index 96%
rename from MACOSX.md
rename to MACOS.md
index 1bee7f45..67aae19b 100644
--- a/MACOSX.md
+++ b/MACOS.md
@@ -1,20 +1,20 @@
-Installation on Mac OS/X
+Installation on macOS
========================
Step by step instruction on getting a full Whimsy test environment up and
-running on Mac OS/X. Not all steps are required for every tool, but steps
+running on macOS. Not all steps are required for every tool, but steps
common to many tools are included here, and additional steps required for
specific tools are linked at the bottom of these instructions.
See also the general [DEVELOPMENT.md](./DEVELOPMENT.md) configuration notes.
-:dizzy: **New!** For a simpler way to setup a Mac OSX machine, please
+:dizzy: **New!** For a simpler way to setup a macOS machine, please
check out the [setupmymac script](./SETUPMYMAC.md), which automates
configuring and keeping updated a local Whimsy instance.
Install Homebrew
----------------
-Homebrew is a package manager for OSX, which is used to install other tools.
+Homebrew is a package manager for macOS, which is used to install other tools.
Follow the instructions from [brew.sh](https://brew.sh/). You might
have to change shells if you are using csh. Bash and zsh work fine. Be sure to
read the Homebrew prerequisites; you may need part(s) of Apple's XCode.
@@ -36,7 +36,7 @@ $ brew update
Upgrade Ruby (if needed)
------------------------
-Much of Whimsy is written in ruby. Versions of OSX prior to 10.15 (Catalina)
+Much of Whimsy is written in ruby. Versions of macOS prior to 10.15 (Catalina)
include an outdated version of ruby.
Verify your current ruby version:
@@ -127,7 +127,7 @@ git remote add asf
https://gitbox.apache.org/repos/asf/whimsy.git
```
Establish a link to this repository in a known location. First instructions
-for Mac OSX version < 10.15 (Mojave, High Sierra, Sierra, ...):
+for macOS version < 10.15 (Mojave, High Sierra, Sierra, ...):
```
cd whimsy
@@ -135,7 +135,7 @@ sudo mkdir /srv
sudo ln -s `pwd` /srv/whimsy
```
-Alternate instructions for Mac OSX version >= 10.15 (Catalina):
+Alternate instructions for macOS version >= 10.15 (Catalina):
```
sudo mkdir /var/whimsy
@@ -218,14 +218,14 @@ Notes:
require this command to be run again.
* Alternatives to running this command can be found in step 4 of
[DEVELOPMENT.md](https://github.com/apache/whimsy/blob/master/DEVELOPMENT.md)
- * The `ldapsearch` command is the standard LDAP utility on MacOSX.
+ * The `ldapsearch` command is the standard LDAP utility on macOS.
Start Apache httpd
------------------
*Note* as an alternative to configuring and starting the version of httpd which
-is provided with MacOSX, you can install a separate version using Homebrew.
+is provided with macOS, you can install a separate version using Homebrew.
Those instructions can be found in an [older version of these
instructions](https://github.com/apache/whimsy/blob/cbe00a45eb949cec8a6798f1172c64166a56e518/MACOSX.md#clone-the-whimsy-code),
specifically, the Install Homebrew, Install Apache httpd, Install passenger,
diff --git a/README.md b/README.md
index 2a42a3b7..d93179f3 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ and mirrored for Apache committers at:
* [Submit Bugs/Enhancement
Requests](https://issues.apache.org/jira/browse/WHIMSY)
* [Questions? See the Mailing
List](https://lists.apache.org/[email protected])
* **Setting Up For Local Development**
- * Mac OSX - [Run setupmymac](./SETUPMYMAC.md) or [Follow manual steps on
OSX](./MACOSX.md)
+ * macOS - [Run setupmymac](./SETUPMYMAC.md) or [Follow manual
steps](./MACOS.md)
* [Linux-y setup steps](./DEVELOPMENT.md)
* [Use DOCKER to run Whimsy locally](./DOCKER.md)
* [General FAQs for developing the Whimsy
Way](./DEVELOPMENT.md#how-to--faq-question)
diff --git a/SETUPMYMAC.md b/SETUPMYMAC.md
index 987a2be2..9b8aca2e 100644
--- a/SETUPMYMAC.md
+++ b/SETUPMYMAC.md
@@ -1,4 +1,4 @@
-Automatically Setup Your Mac OSX Environment
+Automatically Setup Your macOS Environment
============================================
If you have a MacBook you undoubtedly have never used LDAP on it, have a
@@ -80,5 +80,5 @@ Setupmymac notes
* Dry run may not be accurate as running commands may change the state of the
system, affecting what subsequent commands are necessary.
If you want to know what is going on under the covers with the setupmymac
-scripts, visit either of the detailed step-by-step [macOS](./MACOSX.md) or
[Docker](./DOCKER.md)
+scripts, visit either of the detailed step-by-step [macOS](./MACOS.md) or
[Docker](./DOCKER.md)
instructions.
diff --git a/config/secretary-workbench.md b/config/secretary-workbench.md
index e87438cf..faca9adc 100644
--- a/config/secretary-workbench.md
+++ b/config/secretary-workbench.md
@@ -17,7 +17,7 @@ Look for a line that says either `Bundle complete!` or
`Bundle updated!`.
Install gpg
-----------
-Mac OS/X users can `brew install gpg`. Linux users likely either already
+macOS users can `brew install gpg`. Linux users likely either already
have this installed, or can make use of the package manager for their
operating system.
diff --git a/config/setupmymac b/config/setupmymac
index 4ac22e96..9466a6b0 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -459,7 +459,7 @@ config = File.read(HTTPD_CONF)
# uncomment necessary modules
-instructions = File.read(File.expand_path('../MACOSX.md', __dir__))
+instructions = File.read(File.expand_path('../MACOS.md', __dir__))
section = instructions[/^Configure whimsy.local vhost\n--+\n.*?\n--/m]
diff --git a/lib/spec/lib/svn_wunderbar_spec.rb
b/lib/spec/lib/svn_wunderbar_spec.rb
index 1f4a33d0..3f67dacf 100644
--- a/lib/spec/lib/svn_wunderbar_spec.rb
+++ b/lib/spec/lib/svn_wunderbar_spec.rb
@@ -219,7 +219,7 @@ describe "ASF::SVN.svnmucc_", skip: svnmucc_missing do
rc, out = _json do |_|
ASF::SVN.svnmucc_([['xyz']],'test',ENV_.new,_,nil)
end
- puts out if rc.nil? # Try to debug Travis OSX failure
+ puts out if rc.nil? # Try to debug Travis macOS failure
expect(rc).to eq(1)
end
it "svnmucc_([['help']],'test',ENV_.new,_,nil) should produce help message
with --message test" do
diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index ae342a25..bae62167 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -221,7 +221,7 @@ module ASF
content += "base dc=apache,dc=org\n"
end
- # ensure TLS_REQCERT is allow (Mac OS/X only)
+ # ensure TLS_REQCERT is allow (macOS only)
if ETCLDAP.include? 'openldap' and not content.include? 'REQCERT allow'
content.gsub!(/^TLS_REQCERT/i, '# TLS_REQCERT')
content += "TLS_REQCERT allow\n"
diff --git a/www/board/agenda/README.md b/www/board/agenda/README.md
index 55229b89..6186d184 100644
--- a/www/board/agenda/README.md
+++ b/www/board/agenda/README.md
@@ -22,7 +22,7 @@ navigate and update that file.
Preparation
---
-This has been tested to work on Mac OSX and Linux. It likely will not work
+This has been tested to work on macOS and Linux. It likely will not work
yet on Windows.
The easiest way to get started is with Docker (see below), but if you
@@ -42,7 +42,7 @@ For planning purposes, prereqs for a _full_ installation will
require:
* Subversion
* Ruby 1.9.3 or greater
* Development libraries and tools (for native extensions)
- * MacOS users
+ * macOS users
* Xcode command line tools (`sudo xcode-select --install`)
* `brew install openldap`
* `brew install cyrus-sasl`
@@ -53,7 +53,7 @@ For planning purposes, prereqs for a _full_ installation will
require:
* `apt-get install build-essential`
* Node.js 14
* [PhantomJS](http://phantomjs.org/) 2.0
- * Mac OS/X Yosemite users should either use `brew install phantomjs`
+ * macOS Yosemite users should either use `brew install phantomjs`
or get the binary from comments on
[12900](https://github.com/ariya/phantomjs/issues/12900).
* Ubuntu users can get a working binary from the comments on
diff --git a/www/docs/index.cgi b/www/docs/index.cgi
index 273d5c70..212cf510 100755
--- a/www/docs/index.cgi
+++ b/www/docs/index.cgi
@@ -31,7 +31,7 @@ _html do
'https://github.com/apache/whimsy/blob/master/DEVELOPMENT.md' =>
"Developer Overview / How-To",
'https://github.com/apache/whimsy/blob/master/CONFIGURE.md' => "How To
Configure Whimsy",
'https://github.com/apache/whimsy/blob/master/DEPLOYMENT.md' =>
"Deploying Whimsy On Server",
- 'https://github.com/apache/whimsy/blob/master/MACOSX.md' => "Mac OSX
Local Setup",
+ 'https://github.com/apache/whimsy/blob/master/MACOS.md' => "macOS
Local Setup",
'https://github.com/apache/whimsy/blob/master/README.md' => "Whimsy
Intro README",
'/docs/api/' => "whimsy/asf and ASF:: module API docs",
"https://github.com/rubys/wunderbar/"; => "Wunderbar Module Docs"
diff --git a/www/secretary/workbench/README b/www/secretary/workbench/README
index baf17b5c..5bd8b604 100644
--- a/www/secretary/workbench/README
+++ b/www/secretary/workbench/README
@@ -20,7 +20,7 @@ Notes:
Some functions will require installations of gpg, imageMagick and pdftk.
- OS X El Capitan users may want to look at:
+ macOS El Capitan users may want to look at:
http://stackoverflow.com/a/33248310
Overview of files:
diff --git a/www/secretary/workbench/public/HOWTO.html
b/www/secretary/workbench/public/HOWTO.html
index 2517cef6..7308091c 100644
--- a/www/secretary/workbench/public/HOWTO.html
+++ b/www/secretary/workbench/public/HOWTO.html
@@ -49,7 +49,7 @@
<p>A single action is possible from this index page: deleting spam.
Select (single click) the row containing the spam and click
- either command-delete (Mac OS/X) or control-backspace (Windows and
+ either command-delete (macOS) or control-backspace (Windows and
Linux). A button will appear at the bottom of the list enabling you
to undo the last deletion.</p>
@@ -63,7 +63,7 @@
<p>Following these actions are a list of attachments. Click on one
to view the attachments and provide access to forms for further
- processing. Right clicking (or control-click on Mac OS/X) on the
+ processing. Right clicking (or control-click on macOS) on the
attachment will bring up an edit menu. Drag and drop an attachment
over another attachment to append (staple) the dragged attachment to
the attachment onto which it was dropped.</p>
@@ -93,7 +93,7 @@
<p>A list of links follows this form.</p>
<p>Deleting the entire email is also possible from this page. Click
- either command-delete (Mac OS/X) or control-backspace (Windows and
+ either command-delete (macOS) or control-backspace (Windows and
Linux).</p>
<p>Clicking on the <span class="bg-success">Secretary Mail</span> header
