Skip to content
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

Fix typos in getting started docs. #351

Merged
merged 1 commit into from
Sep 18, 2014
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
4 changes: 2 additions & 2 deletions src/sphinx/GettingStartedApplications/AddingConfiguration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Now, if we run the ``stage`` task, we'll see this file show up in the distributi
bin/
conf/
lib/
$ ls target/unviersal/stage/conf
$ ls target/universal/stage/conf
jvmopts

By default, any file in the ``src/universal`` directory is packaged. This is a convenient way to include things like licenses, and readmes.
Expand Down Expand Up @@ -131,4 +131,4 @@ One means of doing this is hooking the ``batScriptExtraDefines`` key. This allo
Now, the windows version will also load the configuration from the ``conf/`` directory of the package.


Next, let's :doc:`add some generated files <GeneratingFiles>`.
Next, let's :doc:`add some generated files <GeneratingFiles>`.
2 changes: 1 addition & 1 deletion src/sphinx/GettingStartedApplications/GeneratingFiles.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ You can see the license file is now included in the distribution.

TODO - Describe linuxPackageMappings

With control over mappings, you can rework any aspect of the native packager defaults just be overriding
With control over mappings, you can rework any aspect of the native packager defaults just by overriding
which files are used. However, sometimes the defaults don't need to be completely replaced, just altered a bit.

Next, let's look at :doc:`how to provide our own BASH template <OverridingTemplates>` that the native packager will use when generating
Expand Down
4 changes: 2 additions & 2 deletions src/sphinx/GettingStartedServers/OverrdingTemplates.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ For the ``java_server`` package lifecycle scripts are customized to provide the
* Register application at your init system

For this purpose *sbt-native-packager* ships with some predefined templates. These can be
override with different techniques, depending on the packaging system.
overriden with different techniques, depending on the packaging system.

RPM Scriptlets
==============
Expand Down Expand Up @@ -120,4 +120,4 @@ Linux Replacements
${{app_name}}
${{daemon_user}}
${{daemon_group}}