git.iko.soy/typeable/pandoc
on master help sign in
Name change OSX -> macOS (#3869)

* Name change OSX -> macOS fix commit c96b64e This commit finishes remaining osx to macOS change, as well as replacing MacOS with macOS. The reason for the later one is because the "correct" casing of macOS is like that. Apple styles it to looks like iOS, watchOS, tvOS, etc. And unfortunately they all start with a lowercase letter, making propercasing (or even title-casing) odd. * fix casing of Linux, UNIX, and Windows

commit5c1d844e40b146dd16e88a662368fe1824c46888 authorickc <ickc@users.noreply.github.com> dateWed 23 Aug 2017, 13:48 (9 years ago) parentf297659
9 files changed+21−21
compare with master
unifiedsplit
INSTALL.md+4−4 MANUAL.txt+4−4 RELEASE-CHECKLIST+2−2 RELEASE-CHECKLIST.md+2−2 macos/make_macos_package.sh+3−3 macos/uninstall-pandoc.pl+1−1 man/pandoc.1+3−3 stack.full.yaml+1−1 windows/Pandoc-en-us.wxl+1−1
INSTALL.md+4−4
@@ -19,7 +19,7 @@
1919 copy /y "%TEMP%\pandoc\pandoc-citeproc.exe" C:\Utils\Console\
2020 rmdir /s /q "%TEMP%\pandoc\"
2121
22−## MacOS
22+## macOS
2323
2424 - There is a package installer at pandoc's [download page].
2525 If you later want to uninstall the package, you can do so
@@ -27,12 +27,12 @@
2727 and running it with `perl uninstall-pandoc.pl`.
2828
2929 - It is possible to extract the pandoc and pandoc-citeproc
30− executables from the MacOS pkg file, if you'd rather not run
30+ executables from the macOS pkg file, if you'd rather not run
3131 the installer. To do this (for the version 1.19.1 package):
3232
3333 mkdir pandoc-extract
3434 cd pandoc-extract
35− xar -x ../pandoc-1.19.1-osx.pkg
35+ xar -x ../pandoc-2.0-macOS.pkg
3636 cat pandoc.pkg/Payload | gunzip -dc | cpio -i
3737 # executables are now in ./usr/bin/, man pages in ./usr/share/man
3838
@@ -180,7 +180,7 @@ The easiest way to build pandoc from source is to use [stack]:
180180
181181 Note that this requires the `text-icu` library, which in turn
182182 depends on the C library `icu4c`. Installation directions
183− vary by platform. Here is how it might work on MacOS with homebrew:
183+ vary by platform. Here is how it might work on macOS with homebrew:
184184
185185 brew install icu4c
186186 cabal install --extra-lib-dirs=/usr/local/Cellar/icu4c/51.1/lib \
MANUAL.txt+4−4
@@ -336,7 +336,7 @@ General options
336336
337337: Specify the user data directory to search for pandoc data files.
338338 If this option is not specified, the default user data directory
339− will be used. This is, in Unix:
339+ will be used. This is, in UNIX:
340340
341341 $HOME/.pandoc
342342
@@ -608,7 +608,7 @@ General writer options
608608`--eol=crlf`|`lf`|`native`
609609
610610: Manually specify line endings: `crlf` (Windows), `lf`
611− (MacOS/linux/unix), or `native` (line endings appropriate
611+ (macOS/Linux/UNIX), or `native` (line endings appropriate
612612 to the OS on which pandoc is being run). The default is
613613 `native`.
614614
@@ -706,8 +706,8 @@ General writer options
706706`--resource-path=`*SEARCHPATH*
707707
708708: List of paths to search for images and other resources.
709− The paths should be separated by `:` on linux, unix, and
710− MacOS systems, and by `;` on Windows. If `--resource-path`
709+ The paths should be separated by `:` on Linux, UNIX, and
710+ macOS systems, and by `;` on Windows. If `--resource-path`
711711 is not specified, the default resource path is the working
712712 directory. Note that, if `--resource-path` is specified,
713713 the working directory must be explicitly listed or it
RELEASE-CHECKLIST+2−2
@@ -1,4 +1,4 @@
1−_ Test, on linux, windows, mac (inc. website demos)
1+_ Test, on Linux, Windows, macOS (inc. website demos)
22
33_ Finalize changelog
44 git log --pretty='format:%n%n* %s (%an)%n%b%n%h%n' --reverse --name-only 1.17.0.3..HEAD > LOG
@@ -12,7 +12,7 @@ _ Push templates:
1212
1313_ Generate Windows package (make winpkg)
1414
15−_ Generate MacOS package (make macospkg)
15+_ Generate macOS package (make macospkg)
1616
1717_ Generate Ubuntu/Debian deb package (make debpkg)
1818
RELEASE-CHECKLIST.md+2−2
@@ -1,4 +1,4 @@
1−- [ ] Test, on linux, windows, mac (inc. website demos)
1+- [ ] Test, on Linux, Windows, macOS (inc. website demos)
22
33- [ ] Finalize changelog:
44 `git log --pretty='format:%n%n* %s (%an)%n%b%n%h%n' --reverse --name-only 1.17.0.3..HEAD > LOG`
@@ -11,7 +11,7 @@
1111
1212- [ ] Generate Windows package (`make winpkg`)
1313
14−- [ ] Generate Mac OSX package (`make osxpkg`)
14+- [ ] Generate macOS package (`make macospkg`)
1515
1616- [ ] Generate Ubuntu/Debian deb package (`make debpkg`)
1717
macos/make_macos_package.sh+3−3
@@ -59,15 +59,15 @@ $PANDOC --data data -t html5 -s COPYING.md -Vpagetitle="License" -o $RESOURCES/l
5959# make sure it's valid... returns nonzero exit code if it isn't:
6060#spctl --assess --type execute $DEST/bin/pandoc
6161
62−echo Creating MacOS package...
62+echo Creating macOS package...
6363
6464sed -e "s/PANDOCVERSION/$VERSION/" $MACOS/distribution.xml.in > $MACOS/distribution.xml
6565
6666pkgbuild --root $ROOT --identifier net.johnmacfarlane.pandoc --version $VERSION --ownership recommended $DIST/pandoc.pkg
67−productbuild --distribution $MACOS/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "${DEVELOPER_ID_INSTALLER}" $BASE-MacOS.pkg
67+productbuild --distribution $MACOS/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "${DEVELOPER_ID_INSTALLER}" $BASE-macOS.pkg
6868
6969# verify signature
70−spctl --assess --type install $BASE-MacOS.pkg
70+spctl --assess --type install $BASE-macOS.pkg
7171
7272# cleanup
7373rm -r $DIST
macos/uninstall-pandoc.pl+1−1
@@ -1,6 +1,6 @@
11#!/usr/bin/perl
22
3−# Script to remove all files installed by the OSX pandoc installer
3+# Script to remove all files installed by the macOS pandoc installer
44# and unregister the package. Modified from a script contributed
55# by Daniel T. Staal.
66
man/pandoc.1+3−3
@@ -304,7 +304,7 @@ If \f[I]FILE\f[] is \f[C]\-\f[], output will go to \f[I]stdout\f[].
304304Specify the user data directory to search for pandoc data files.
305305If this option is not specified, the default user data directory will be
306306used.
307−This is, in Unix:
307+This is, in UNIX:
308308.RS
309309.IP
310310.nf
@@ -638,7 +638,7 @@ Files in the user data directory are ignored.
638638.TP
639639.B \f[C]\-\-eol=crlf\f[]|\f[C]lf\f[]|\f[C]native\f[]
640640Manually specify line endings: \f[C]crlf\f[] (Windows), \f[C]lf\f[]
641−(MacOS/linux/unix), or \f[C]native\f[] (line endings appropriate to the
641+(macOS/Linux/UNIX), or \f[C]native\f[] (line endings appropriate to the
642642OS on which pandoc is being run).
643643The default is \f[C]native\f[].
644644.RS
@@ -760,7 +760,7 @@ Implies \f[C]\-\-standalone\f[].
760760.TP
761761.B \f[C]\-\-resource\-path=\f[]\f[I]SEARCHPATH\f[]
762762List of paths to search for images and other resources.
763−The paths should be separated by \f[C]:\f[] on linux, unix, and MacOS
763+The paths should be separated by \f[C]:\f[] on Linux, UNIX, and macOS
764764systems, and by \f[C];\f[] on Windows.
765765If \f[C]\-\-resource\-path\f[] is not specified, the default resource
766766path is the working directory.
stack.full.yaml+1−1
@@ -9,7 +9,7 @@ flags:
99 pandoc-citeproc:
1010 bibutils: true
1111 embed_data_files: true
12−# if you are on OSX, stack install cpphs and
12+# if you are on macOS, stack install cpphs and
1313# uncomment the following three lines:
1414ghc-options:
1515 pandoc-citeproc: '-pgmP cpphs -optP--cpp'
windows/Pandoc-en-us.wxl+1−1
@@ -9,6 +9,6 @@
99
1010[APPLICATIONFOLDER].
1111
12−You may need to restart Cmd/Powershell windows before using it.</String>
12+You may need to restart Cmd/Powershell Windows before using it.</String>
1313
1414</WixLocalization>