Skip to content

Commit

Permalink
Assorted documentation spelling and grammar fixes (#3095)
Browse files Browse the repository at this point in the history
Fixes typos, capitalisation errors ('Github', 'Javascript' etc.) and
some standard Frenchisms ('informations', 'allows to' etc.).

Signed-off-by: Craig Ferguson <me@craigfe.io>
  • Loading branch information
craigfe committed Feb 6, 2020
1 parent 1116cde commit d7dda4d
Show file tree
Hide file tree
Showing 16 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ developed at [Jane Street][js] and is now maintained by Jane Street,
[OCamlLabs][ocl] as well as several developers from the OCaml
community.

Contributions to Dune are welcome and should be submitted via github
Contributions to Dune are welcome and should be submitted via GitHub
pull requests against the `master` branch. Dune is distributed under
the MIT license and contributors are required to sign their work in
order to certify that they have the right to submit it under this
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Support
-------

If you have questions about dune, you can send an email to
ocaml-core@googlegroups.com or [open a ticket on github][issues].
ocaml-core@googlegroups.com or [open a ticket on GitHub][issues].


Migration from jbuilder
Expand Down
2 changes: 1 addition & 1 deletion bin/cache_daemon.ml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let name = "cache"
let man =
[ `S "DESCRIPTION"
; `P
{|Dune allows to share build artifacts between workspaces.
{|Dune is able to share build artifacts between workspaces.
$(b,dune cache-daemon) is a daemon that runs in the background
and manages this shared cache. For instance, it makes sure that it
does not grow too big and try to maximise sharing between the various
Expand Down
4 changes: 2 additions & 2 deletions bin/common.ml
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ module Options_implied_by_dash_p = struct
~env:(Arg.env_var ~doc "DUNE_PROFILE")
~doc:
(Printf.sprintf
"Select the build profile, for instance $(b,dev) \
or$(b,release). The default is $(b,%s)."
"Select the build profile, for instance $(b,dev) or \
$(b,release). The default is $(b,%s)."
(Profile.to_string Dune.Profile.default)))
in
match profile with
Expand Down
4 changes: 2 additions & 2 deletions bin/help.ml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ let config =
looking at the environment variable $(b,INSIDE_EMACS) that is set by
Emacs. If you want the same behavior with another editor, you can set
this variable. If your editor already sets another variable,
please open a ticket on the ocaml/dune github project so that we can
please open a ticket on the ocaml/dune GitHub project so that we can
add support for it.|}
; `S "JOBS"
; `P {|Syntax: $(b,\(jobs NUMBER\))|}
Expand All @@ -68,7 +68,7 @@ let config =
; `S "SANDBOXING"
; `P {|Syntax: $(b,\(sandboxing_preference MODE ...\))|}
; `P
{|Controls the sandboxing mode perference order used by dune. Dune will
{|Controls the sandboxing mode preference order used by dune. Dune will
use the earliest item from this list that's allowed by the action dependency
specification, or fall back on the hard-coded default. See $(b,man dune-build)
for the description of individual modes.|}
Expand Down
6 changes: 3 additions & 3 deletions doc/advanced-topics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ Dynamic loading of packages
===========================

Dune supports the ``findlib.dynload`` package from `findlib
<http://projects.camlcity.org/projects/findlib.html>`_ that allows to
dynamically load packages and their dependencies (using OCaml Dynlink module).
<http://projects.camlcity.org/projects/findlib.html>`_ that enables
dynamically loading packages and their dependencies (using the OCaml Dynlink module).
So adding the ability for an application to have plugins just requires to add
``findlib.dynload`` to the set of library dependencies:

Expand Down Expand Up @@ -198,7 +198,7 @@ interpreted relative to the current directory:
``library`` stanza (*not* its public name).

In each case, the expansion of the variable is a path pointing inside the build
context (ie ``_build/<context>``).
context (i.e. ``_build/<context>``).

Building an ad-hoc ``.cmxs``
----------------------------
Expand Down
24 changes: 12 additions & 12 deletions doc/concepts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Scopes

Any directory containing at least one ``<package>.opam`` file defines
a scope. This scope is the sub-tree starting from this directory,
excluding any other scopes rooted in sub-direcotries.
excluding any other scopes rooted in sub-directories.

Typically, any given project will define a single scope. Libraries and
executables that are not meant to be installed will be visible inside
Expand Down Expand Up @@ -116,7 +116,7 @@ Variables
=========

Some fields can contains variables that are expanded by dune.
The syntax of variables is as follow:
The syntax of variables is as follows:

.. code::
Expand Down Expand Up @@ -166,13 +166,13 @@ Dune supports the following variables:
- ``profile`` the profile selected via ``--profile``
- ``context_name`` the name of the context (``default`` or defined in the
workspace file)
- ``os_type`` is the type of the OS the build is targetting. This is
- ``os_type`` is the type of the OS the build is targeting. This is
the same as ``ocaml-config:os_type``
- ``architecture`` is the type of the architecture the build is targetting. This
- ``architecture`` is the type of the architecture the build is targeting. This
is the same as ``ocaml-config:architecture``
- ``model`` is the type of the cpu the build is targetting. This is
- ``model`` is the type of the CPU the build is targeting. This is
the same as ``ocaml-config:model``
- ``system`` is the name of the OS the build is targetting. This is the same as
- ``system`` is the name of the OS the build is targeting. This is the same as
``ocaml-config:system``
- ``ignoring_promoted_rule`` is ``true`` if
``--ignore-promoted-rules`` was passed on the command line and
Expand Down Expand Up @@ -212,7 +212,7 @@ In addition, ``(action ...)`` fields support the following special variables:
host build context.
- ``lib-available:<library-name>`` expands to ``true`` or ``false`` depending on
whether the library is available or not. A library is available iff at least
one of the following condition holds:
one of the following conditions holds:

- it is part the installed worlds
- it is available locally and is not optional
Expand Down Expand Up @@ -564,7 +564,7 @@ You can use globs to declare dependencies on a set of files. Note that globs
will match files that exist in the source tree as well as buildable targets, so
for instance you can depend on ``*.cmi``.

Currently dune only support globbing files in a single directory. And in
Currently dune only supports globbing files in a single directory. And in
particular the glob is interpreted as follows:

- anything before the last ``/`` is taken as a literal path
Expand Down Expand Up @@ -638,7 +638,7 @@ The following constructions are available:
- ``(run <prog> <args>)`` to execute a program. ``<prog>`` is resolved
locally if it is available in the current workspace, otherwise it is
resolved using the ``PATH``
- ``(dynamic-run <prog> <args>)`` to execute a program that was linkied
- ``(dynamic-run <prog> <args>)`` to execute a program that was linked
against ``dune-action-plugin`` library. ``<prog>`` is resolved in
the same way as in ``run``
- ``(chdir <dir> <DSL>)`` to change the current directory
Expand Down Expand Up @@ -783,7 +783,7 @@ certain limitations:
- Performance impact is usually small, but it can get noticeable for
fast actions with very large sets of dependencies.

Per-action sandboxing confuguration
Per-action sandboxing configuration
-----------------------------------

Some actions may rely on sandboxing to work correctly.
Expand Down Expand Up @@ -824,7 +824,7 @@ Locks
Given two rules that are independent, dune will assume that there
associated action can be run concurrently. Two rules are considered
independent if none of them depend on the other, either directly or
through a chain of dependencies. This basic assumption allows to
through a chain of dependencies. This basic assumption allows dune to
parallelize the build.

However, it is sometimes the case that two independent rules cannot be
Expand Down Expand Up @@ -892,7 +892,7 @@ However, it is different for the following reason:
- on Windows, both ``(diff a b)`` and ``(diff? a b)`` normalize the end of
lines before comparing the files

- since ``(diff a b)`` is a builtin action, dune knowns that ``a``
- since ``(diff a b)`` is a builtin action, dune knows that ``a``
and ``b`` are needed and so you don't need to specify them
explicitly as dependencies

Expand Down
2 changes: 1 addition & 1 deletion doc/cross-compilation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ to the definition of a build context.

Note that at the moment, there is no official support for
cross-compilation in OCaml. Dune supports the opam-cross-x
repositories from the `ocaml-cross organization on github
repositories from the `ocaml-cross organization on GitHub
<https://github.com/ocaml-cross/>`_, such as:

- `opam-cross-windows <https://github.com/ocaml-cross/opam-cross-windows>`_
Expand Down
56 changes: 28 additions & 28 deletions doc/dune-files.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ false)``
explicit_js_mode
----------------

Traditionally, Javascript targets were defined for every bytecode executable.
Traditionally, JavaScript targets were defined for every bytecode executable.
This was not very precise and did not interact well with the ``@all`` alias.

You can opt out of this behaviour by using:
Expand All @@ -93,7 +93,7 @@ You can opt out of this behaviour by using:
(explicit_js_mode)
When this mode is enabled, an explicit ``js`` mode needs to be added to the
``(modes ...)`` field of executables in order to trigger Javascript
``(modes ...)`` field of executables in order to trigger JavaScript
compilation. Explicit JS targets declared like this will be attached to the
``@all`` alias.

Expand Down Expand Up @@ -212,7 +212,7 @@ With this fields in, every time dune is called to execute some rules (either via
``dune build``, ``dune runtest`` or something else), the opam files get
generated.

Some or all of these fields may be overriden for each package of the project, see
Some or all of these fields may be overridden for each package of the project, see
:ref:`package`.

.. _package:
Expand Down Expand Up @@ -247,7 +247,7 @@ It contains the following fields:
<url>)``, ``(documentation <url>)`` are the same (and take precedence over)
the corresponding global fields. These fields are available since Dune 2.0.

The list of dependencies ``<dep-specification>`` is modeled after opam's own
The list of dependencies ``<dep-specification>`` is modelled after opam's own
language: The syntax is as a list of the following elements:

.. code::
Expand Down Expand Up @@ -428,7 +428,7 @@ to use the :ref:`include_subdirs` stanza.
dependencies here. You don't need to do so unless you use dune to
synthesize the ``depends`` and ``depopts`` sections of your opam file

- ``js_of_ocaml`` sets options for Javascript compilation, see :ref:`jsoo-field`
- ``js_of_ocaml`` sets options for JavaScript compilation, see :ref:`jsoo-field`

- ``flags``, ``ocamlc_flags`` and ``ocamlopt_flags``. See the section about
:ref:`ocaml-flags`
Expand Down Expand Up @@ -472,7 +472,7 @@ to use the :ref:`include_subdirs` stanza.
we were waiting for proper support for virtual libraries. Do not use
in new code, it will be deleted in dune 2.0

- ``(enabled_if <blang expression>)`` allows to conditionally disable
- ``(enabled_if <blang expression>)`` conditionally disables
a library. A disabled library cannot be built and will not be
installed. The condition is specified using the :ref:`blang`, and the
field allows for the ``%{os_type}`` variable, which is expanded to
Expand Down Expand Up @@ -525,9 +525,9 @@ See :ref:`jsoo` for more information.
deprecated_library_name
-----------------------

The ``deprecated_library_name`` stanza allows to redirect an old
The ``deprecated_library_name`` stanza enables redirecting an old
deprecated name after a library has been renamed. It's syntax is as
follow:
follows:

.. code:: scheme
Expand Down Expand Up @@ -642,7 +642,7 @@ Executables can also be linked as object or shared object files. See

- ``(optional)`` is the same as the corresponding field of `library`_

- ``(promote <options>)`` allows to promote the linked executables to
- ``(promote <options>)`` allows promoting the linked executables to
the source tree. The options are the same as for the :ref:`rule
promote mode <promote>`. Adding ``(promote (until-clean))`` to an
``executable`` stanza will cause Dune to copy the ``.exe`` files to
Expand All @@ -661,12 +661,12 @@ Executables can also be linked as object or shared object files. See
being pulled in, either through a direct or transitive dependency,
Dune fails with an error message explaining how the library was
pulled in. This field is available since the 2.0 version of the dune
languge.
language.

Linking modes
~~~~~~~~~~~~~

The ``modes`` field allows to select what linking modes should be used
The ``modes`` field allows selecting what linking modes should be used
to link executables. Each mode is a pair ``(<compilation-mode>
<binary-kind>)`` where ``<compilation-mode>`` describes whether the
byte code or native code backend of the OCaml compiler should be used
Expand All @@ -685,7 +685,7 @@ compilation is not available.
- ``shared_object`` for producing object files that can be dynamically
loaded into an application. This mode can be used to write a plugin
in OCaml for a non-OCaml application.
- ``js`` for producing Javascript from bytecode executables, see
- ``js`` for producing JavaScript from bytecode executables, see
:ref:`explicit-js-mode`.

For instance the following ``executables`` stanza will produce byte
Expand Down Expand Up @@ -860,7 +860,7 @@ field. The following modes are available:
The ``(promote <options>)`` form is only available since Dune
1.10. Before Dune 1.10, you need to use one of the ``promote-...``
forms. The ``promote-...`` forms should disappear in Dune 2.0, so
using the more generic ``(promote <options>)`` form should be prefered
using the more generic ``(promote <options>)`` form should be preferred
in new projects.

There are two use cases for promote rules. The first one is when the
Expand Down Expand Up @@ -1103,7 +1103,7 @@ install

Dune supports installing packages on the system, i.e. copying freshly built
artifacts from the workspace to the system. The ``install`` stanza takes three
informations:
pieces of information:

- the list of files the install
- the package to attach these files to. This field is optional if your
Expand All @@ -1120,7 +1120,7 @@ For instance:
(package mypackage))
Indicate that the file ``hello.txt`` in the current directory is to be
installed in ``<prefix>/share/mypacakge``.
installed in ``<prefix>/share/mypackage``.

The following sections are available:

Expand Down Expand Up @@ -1195,7 +1195,7 @@ as the difference between the ``copy`` and ``copy#`` action. See the
include
-------

The ``include`` stanza allows to include the contents of another file into the
The ``include`` stanza allows including the contents of another file in the
current dune file. Currently, the included file cannot be generated and must be
present in the source tree. This feature is intended to be used in conjunction
with promotion, when parts of a dune file are to be generated.
Expand All @@ -1212,7 +1212,7 @@ For instance:
(alias runtest)
(action (diff dune.inc dune.inc.gen)))
With this dune file, running dune as follow will replace the
With this dune file, running dune as follows will replace the
``dune.inc`` file in the source tree by the generated one:

.. code:: shell
Expand Down Expand Up @@ -1275,7 +1275,7 @@ where the ``name`` field is singular. The same optional fields are supported.
env
---

The ``env`` stanza allows to modify the environment. The syntax is as
The ``env`` stanza allows one to modify the environment. The syntax is as
follow:

.. code:: scheme
Expand Down Expand Up @@ -1320,7 +1320,7 @@ Fields supported in ``<settings>`` are:
dirs (since 1.6)
-------------------

The ``dirs`` stanza allows to tell specify the sub-directories dune will
The ``dirs`` stanza allows specifying the sub-directories dune will
include in a build. The syntax is based on dune's :ref:`predicate-lang` and allows
the user the following operations:

Expand Down Expand Up @@ -1418,7 +1418,7 @@ include_subdirs
---------------

The ``include_subdirs`` stanza is used to control how dune considers
sub-directories of the current directory. The syntax is as follow:
sub-directories of the current directory. The syntax is as follows:

.. code:: scheme
Expand Down Expand Up @@ -1521,7 +1521,7 @@ The basic form for defining Coq libraries is very similar to the OCaml form:
The stanza will build all `.v` files on the given directory. The semantics of fields is:

- ``<module_prefix>`` will be used as the default Coq library prefix ``-R``,
- the ``modules`` field allows to constrain the set of modules
- the ``modules`` field enables constraining the set of modules
included in the library, similarly to its OCaml counterpart,
- ``public_name`` will make Dune generate install rules for the `.vo`
files; files will be installed in
Expand Down Expand Up @@ -1652,29 +1652,29 @@ context or can be the description of an opam switch, as follows:
``<optional-fields>`` are:

- ``(name <name>)`` is the name of the subdirectory of ``_build``
where the artifacts for this build context will be stored
where the artifacts for this build context will be stored.

- ``(root <opam-root>)`` is the opam root. By default it will take
the opam root defined by the environment in which ``dune`` is
run which is usually ``~/.opam``
run which is usually ``~/.opam``.

- ``(merlin)`` instructs dune to use this build context for
merlin
merlin.

- ``(profile <profile>)`` to set a different profile for a build
context. This has precedence over the command line option
``--profile``
``--profile``.

- ``(env <env>)`` to set the environment for a particular context. This is of
higher precedence than the root ``env`` stanza in the workspace file. This
field the same options as the :ref:`dune-env` stanza.

- ``(toolchain <findlib_coolchain>)`` set findlib toolchain for the context.
- ``(toolchain <findlib_toolchain>)`` set findlib toolchain for the context.

- ``(host <host_context>)`` choose a different context to build binaries that
are meant to be executed on the host machine, such as preprocessors.

- ``(paths (<var1> <val1>) .. (<varN> <valN>))`` allows to set the value of any
- ``(paths (<var1> <val1>) .. (<varN> <valN>))`` allows setting the value of any
``PATH``-like variables in this context. If ``PATH`` itself is modified in
this way, its value will be used to resolve binaries in the workspace,
including finding the compiler and related tools. These variables will also be
Expand All @@ -1693,7 +1693,7 @@ context or can be the description of an opam switch, as follows:
automatically from the default name and ``<target-exe>``, unless
explicitly specified using ``(name ...)`` field. For example, if
``<target_exe>`` is *src/foo.exe* in a default context, then the
name of the cotext is *default-fdo-foo* and the name of the file
name of the context is *default-fdo-foo* and the name of the file
that contains execution counters is *src/fdo.exe.fdo-profile*. This
feature is **experimental** and no backwards compatibility is
implied.
Expand Down
Loading

0 comments on commit d7dda4d

Please sign in to comment.