Skip to content

Commit 50b5061

Browse files
committed
Docs fixes and updates
Signed-off-by: Craig Zerouni <czerouni@gmail.com>
1 parent e278f25 commit 50b5061

14 files changed

Lines changed: 164 additions & 105 deletions

docs/source/caching.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Memcached is widely used, easy to deploy (because there is no storage needed sin
1111
process/executable), and is very fast due to the data residing in memory.
1212

1313
In a studio environment (with many machines), machines that perform a solve that is already cached to the
14-
resolve cache will simply receive the cached result rather than preforming a re-solve. This can significantly
14+
resolve cache will simply receive the cached result rather than performing a re-solve. This can significantly
1515
decrease the time it takes to resolve environments. Slow solves will now be almost instantaneous.
1616

1717
Resolve caching has almost no downsides. Only in rare edge cases where you have to "hack" a released package into
@@ -27,13 +27,13 @@ The following information is stored to the memcached server for each solve:
2727
* Timestamps of packages seen in previous solves.
2828
* Variant states information about the state of a variant. For example, in the 'filesystem' repository type,
2929
the 'state' is the last modified date of the file associated with the variant (perhaps a package.py).
30-
If the state of any variant has changed from a cached resolve - eg. if a file has been modified - the cached resolve is discarded.
30+
If the state of any variant has changed from a cached resolve - e.g. if a file has been modified - the cached resolve is discarded.
3131

3232
Setup
3333
-----
3434

3535
To enable memcached caching, you need to configure the :data:`memcached_uri` config variable.
36-
This variable accepts a list of URI to your memcached servers or None. Example with memcached running on
36+
This variable accepts a list of URIs to your memcached servers or None. Example with memcached running on
3737
localhost on its default port:
3838

3939
.. code-block:: python
@@ -180,7 +180,7 @@ you should **not** enable caching on package repositories where packages may get
180180
overwritten. It is for this reason that caching is disabled for local packages by
181181
default (see :data:`package_cache_local`).
182182

183-
Control Disk Usage
183+
Controlling Disk Usage
184184
------------------
185185

186186
You can control the disk usage of the package cache by using the
@@ -191,8 +191,8 @@ them to your liking.
191191
Another way to control the disk usage is to run the :option:`rez-pkg-cache --clean` command
192192
either manually or as a cron job. See :ref:`caching-cleaning-the-cache`.
193193

194-
Commandline Tool
195-
----------------
194+
Command Line Tool
195+
-----------------
196196

197197
Inspection
198198
++++++++++
@@ -232,7 +232,7 @@ Cached variants have one of the following statuses at any given time:
232232
Logging
233233
+++++++
234234

235-
Caching operations are stored into logfiles within the cache directory. To view:
235+
Caching operations are stored into log files within the cache directory. To view:
236236

237237
.. code-block:: console
238238

docs/source/configuring_rez.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Settings are determined in the following way:
1111
- The setting is then overridden if it is present in another settings file pointed at by the
1212
:envvar:`REZ_CONFIG_FILE` environment variable. This can also be a path-like variable, to read from
1313
multiple configuration files;
14-
- The setting is further overriden if it is present in ``$HOME/.rezconfig`` or ``$HOME/.rezconfig.py``;
14+
- The setting is further overridden if it is present in ``$HOME/.rezconfig`` or ``$HOME/.rezconfig.py``;
1515
- The setting is overridden again if the environment variable :envvar:`REZ_XXX` is present, where ``XXX`` is
16-
the uppercase version of the setting key. For example, :data:`.image_viewer` will be overriden by
16+
the uppercase version of the setting key. For example, :data:`.image_viewer` will be overridden by
1717
:envvar:`REZ_IMAGE_VIEWER`.
1818
- This is a special case applied only during a package build or release. In this case, if the
1919
package definition file contains a "config" section, settings in this section will override all
@@ -109,12 +109,12 @@ JSON formats are supported:
109109
# in rezconfig
110110
default_relocatable_per_package = DelayLoad('/svr/configs/rez_relocs.yaml')
111111
112-
See :Class:`.DelayLoad`.
112+
See :class:`.DelayLoad`.
113113

114114
.. _configuring-rez-commandline-line:
115115

116-
Commandline Tool
117-
================
116+
Command Line Tool
117+
=================
118118

119119
You can use the :ref:`rez-config` command line tool to see what the current configured settings are.
120120
Called with no arguments, it prints all settings; if you specify an argument, it prints out just
@@ -145,6 +145,6 @@ Following is an alphabetical list of rez settings.
145145
file in the rez source, so you can also refer to that file for the same information.
146146

147147
.. This is a custom directive. See the rez_sphinxext.py file for more information.
148-
.. TL;DR: It will take care of generating the documentation or all the settings defined
148+
.. TL;DR: It will take care of generating the documentation for all the settings defined
149149
.. in rezconfig.py
150150
.. rez-config::

docs/source/environment.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ dots replaced with underscore.
102102

103103
.. envvar:: REZ_(PKG)_PATCH_VERSION
104104

105-
The patch version of the package, or an emopty string.
105+
The patch version of the package, or an empty string.
106106

107107
Ephemeral packages environment variables
108108
----------------------------------------
@@ -216,7 +216,7 @@ operation of rez.
216216
For any given rez config entry (see ``rezconfig.py``),
217217
you can override the setting with an environment variable, for convenience. Here,
218218
``XXX`` is the uppercased equivalent of the setting name. For example,
219-
a setting commonly overriden this way is :data:`packages_path`, whos equivalent
219+
a setting commonly overridden this way is :data:`packages_path`, whose equivalent
220220
variable is :envvar:`REZ_PACKAGES_PATH`.
221221

222222
.. hint::
@@ -234,7 +234,7 @@ operation of rez.
234234

235235
.. envvar:: EDITOR
236236

237-
On Linux and OSX systems, this will set the default editor to use
237+
On Linux and macOS systems, this will set the default editor to use
238238
if and when rez requires one (an example is on release if the :data:`prompt_release_message`
239239
config setting is true).
240240

@@ -259,18 +259,18 @@ Development Environment Variables
259259
.. envvar:: REZ_LOG_DEPRECATION_WARNINGS
260260

261261
Enable all deprecation warnings to be logged regardless of how you have configured
262-
your python interpreter. This is usefull to help upgrading to newer versions of rez.
262+
your python interpreter. This is useful to help upgrading to newer versions of rez.
263263
Prior to updating, you should set this environment variable to see if you need to
264264
change some things to be compatible with newer versions.
265265

266266
.. warning::
267267

268268
Enabling this will forcefully load every configuration file instead of loading them
269-
lazilly. This can have an impact on startup time.
269+
lazily. This can have an impact on startup time.
270270

271271
.. envvar:: REZ_SIGUSR1_ACTION
272272

273-
If you set this to ``print_stack``, rez will prints its
273+
If you set this to ``print_stack``, rez will print its
274274
current stacktrace to stdout if sent a USR1 signal. This is for debugging purposes only.
275275

276276
.. envvar:: _REZ_NO_KILLPG

docs/source/ephemerals.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Ephemerals
77
Ephemeral packages (or simply 'ephemerals') are requests for packages that do not
88
exist. Ephemeral package names always begin with a dot (``.``). Like all package
99
requests, ephemerals can be requested as part of packages' requires or variants
10-
lists, or directly by the user (via :ref:`rez-env` for eg).
10+
lists, or directly by the user (via :ref:`rez-env` for e.g.).
1111

1212
Example:
1313

@@ -101,10 +101,10 @@ etc) is present in the resolve. Note that the leading ``.`` is implied and not
101101
included when querying the :attr:`ephemerals` object.
102102

103103
.. warning::
104-
Since :attr:`ephemerals` is a dict-like object, so it has
105-
a ``get`` function which will return a full request string if key exists. Hence,
104+
Since :attr:`ephemerals` is a dict-like object, it has
105+
a ``get`` function which will return a full request string if the key exists. Hence,
106106
the default value should also be a full request string, not just a version range
107-
string like ``0`` in :func:`ephemerals.get_range`. Or :func:`intersects` may not work as expect.
107+
string like ``0`` in :func:`ephemerals.get_range`. Otherwise, :func:`intersects` may not work as expected.
108108

109109
Ephemeral Use Cases
110110
===================
@@ -162,7 +162,7 @@ Abstract Package Representation
162162
Sometimes it makes sense for a package to require some form of abstract object or
163163
capability, rather than an actual package. For example, perhaps your package (or
164164
one of its variants) requires a GPU to be present on the host machine. To support
165-
this, you might have something setup that includes a ``.gpu-1`` ephemeral in the
165+
this, you might have something set up that includes a ``.gpu-1`` ephemeral in the
166166
:ref:`implicits <implicit-packages-concept>` list on all GPU-enabled hosts.
167167
Then, your package could look like this:
168168

@@ -176,7 +176,7 @@ Then, your package could look like this:
176176
]
177177
178178
.. warning::
179-
Be aware that on hosts that do **not** have a gpu
179+
Be aware that on hosts that do **not** have a GPU
180180
implicit, either variant could be selected. You would want to either guarantee
181-
that every host has the gpu implicit set to 0 or 1, or that the user always
181+
that every host has the GPU implicit set to 0 or 1, or that the user always
182182
explicitly specifies ``.gpu-0`` or ``.gpu-1`` in their request.

docs/source/getting_started.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Essential packages
77

88
.. warning::
99
:ref:`rez-bind` is going to be deprecated. The current implementation is not actively maintained.
10-
Especially on windows, using :option:`--quickstart <rez-bind --quickstart>` is likely to fail.
10+
Especially on Windows, using :option:`--quickstart <rez-bind --quickstart>` is likely to fail.
1111

1212
Even if rez-bind will be deprecated and we generally discourage its use, you can safely use it for creating the ``arch``, ``os`` and ``platform`` packages.
1313

@@ -144,7 +144,7 @@ You can use the :ref:`rez-env` tool to request a configured environment containi
144144
> ]$ █
145145
146146
Now you are within the configured environment. The caret (``>``) prefixed to your prompt is a visual
147-
cue telling you that you're within a rez-configured subshell. Rez does not update the currect environment,
147+
cue telling you that you're within a rez-configured subshell. Rez does not update the current environment,
148148
instead it configures a subshell and puts you within it.
149149

150150
Now you can run the ``hello`` tool in our ``hello_world`` package:
@@ -176,7 +176,7 @@ initially created the environment:
176176
platform-osx /home/ajohns/packages/platform/osx (local)
177177
python-2.7.11 /home/ajohns/packages/python/2.7.11/platform-osx/arch-x86_64/os-osx-10.11.5 (local)
178178
179-
To exit the configured environment, simply exist the shell using the ``exit`` command or :kbd:`Control-d`:
179+
To exit the configured environment, simply exit the shell using the ``exit`` command or :kbd:`Control-d`:
180180

181181
You can also create a configured environment and run a command inside of it, with a single command.
182182
When you use this form, the shell is immediately exited after the command runs:

docs/source/guides/update_to_3.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Update to rez 3.0.0
33
===================
44

55
Rez ``3.0.0`` is not be a major breaking change, except that Python 2 is not supported anymore.
6-
There is various other small changes too.
6+
There are various other small changes too.
77

88
This guide will show you how to prepare before upgrading to ``3.0.0``. We hope that this guide will
99
help make the upgrade process smoother.
@@ -22,7 +22,7 @@ Steps for smooth upgrade
2222
if you wish.
2323

2424
You should prefer 2.114.1 over 2.114.0 because 2.114.0 contained a bug that prevented
25-
rez from correctly running when :envvar:`REZ_LOG_DEPRECATION_WARNINGS` is set.
25+
rez from correctly running when :envvar:`REZ_LOG_DEPRECATION_WARNINGS` was set.
2626

2727
.. warning::
2828

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@ ways to get in touch with us:
8989
* `Report an issue <https://github.com/AcademySoftwareFoundation/rez/issues>`_
9090
* `Chat room <https://slack.aswf.io>`_: Join the ``#rez`` channel
9191
* `Start a discussion <https://github.com/AcademySoftwareFoundation/rez/discussions>`_
92-
* `Mailing list <mail:main@lists.aswf.io>`_: Note that are way less active on the mailing
92+
* `Mailing list <mail:main@lists.aswf.io>`_: Note that we are far less active on the mailing
9393
list than on any other communication channel.

docs/source/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Installation Script
77

88
To install rez, you will need:
99

10-
1. Python 3.8 or above. We support 3.8, 3.9, 3.10, 3.11, 3.12 and 3.13.
10+
1. Python 3.7 or above. We support 3.7, 3.8, 3.9, 3.10, and 3.11.
1111
The python interpreter you use to run the install script will be the interpreter
1212
used by rez itself.
1313
2. The source code. You can get it by either cloning the `repository <https://github.com/AcademySoftwareFoundation/rez>`_

docs/source/managing_packages.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repository, but it will not be visible to the rez API nor to any newly resolved
1010
runtimes. Any runtimes that are currently using an ignored package are unaffected,
1111
since the package's payload has not been removed.
1212

13-
To ignore a package via commandline:
13+
To ignore a package via command line:
1414

1515
.. code-block:: console
1616
@@ -36,7 +36,7 @@ Via API:
3636
Both of these options generate a :file:`.ignore{{version}}` file (e.g.
3737
``.ignore3.1.2``) next to the package version directory.
3838

39-
You can also do the reverse (ie unignore a package). Use the :option:`-u <rez-pkg-ignore -u>` option of
39+
You can also do the reverse (i.e. unignore a package). Use the :option:`-u <rez-pkg-ignore -u>` option of
4040
:ref:`rez-pkg-ignore`, or the :meth:`~rez.package_repository.PackageRepository.unignore_package` method on the package repository
4141
object.
4242

@@ -46,7 +46,7 @@ Copying Packages
4646
Packages can be copied from one :ref:`package repository <package-repositories-concept>`
4747
to another, like so:
4848

49-
Via commandline:
49+
Via command line:
5050

5151
.. code-block:: console
5252
@@ -117,7 +117,7 @@ to another. Be aware that moving a package does not actually delete the source
117117
package however. Instead, the source package is hidden (ignored). It is up to
118118
you to delete it at some later date.
119119

120-
To move a package via commandline:
120+
To move a package via command line:
121121

122122
.. code-block:: console
123123
@@ -143,7 +143,7 @@ Via API:
143143
None
144144
145145
Be aware that a non-relocatable package is also not movable (see
146-
:attr:`here <relocatable>`. Like package
146+
:attr:`here <relocatable>`). Like package
147147
copying, there is a ``force`` option to move it regardless.
148148

149149
A typical reason you might want to move a package is to archive packages that are
@@ -164,7 +164,7 @@ Packages can be removed. This is different from ignoring. The package and its
164164
payload is deleted from storage, whereas ignoring just hides it. It is not
165165
possible to un-remove a package.
166166

167-
To remove a package via commandline:
167+
To remove a package via command line:
168168

169169
.. code-block:: console
170170

0 commit comments

Comments
 (0)