From 5c62648ed67d05bcb207a68d35d3f036d22c35f5 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Sun, 20 Jan 2019 19:26:43 +0000 Subject: [PATCH] manual: Minor grammar fixes --- doc/manual/management_system.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/manual/management_system.rst b/doc/manual/management_system.rst index 12f5e45d6..7f8561712 100644 --- a/doc/manual/management_system.rst +++ b/doc/manual/management_system.rst @@ -40,7 +40,7 @@ Experiment scheduling Basics ------ -To use hardware resources more efficiently, potentially compute-intensive pre-computation and analysis phases of other experiments is executed in parallel with the body of the current experiment that accesses the hardware. +To use hardware resources more efficiently, potentially compute-intensive pre-computation and analysis phases of other experiments are executed in parallel with the body of the current experiment that accesses the hardware. .. seealso:: These steps are implemented in :class:`~artiq.language.environment.Experiment`. However, user-written experiments should usually derive from (sub-class) :class:`artiq.language.environment.EnvExperiment`. @@ -83,7 +83,7 @@ Multiple pipelines Multiple pipelines can operate in parallel inside the same master. It is the responsibility of the user to ensure that experiments scheduled in one pipeline will never conflict with those of another pipeline over resources (e.g. same devices). -Pipelines are identified by their name, and are automatically created (when an experiment is scheduled with a pipeline name that does not exist) and destroyed (when it runs empty). +Pipelines are identified by their name, and are automatically created (when an experiment is scheduled with a pipeline name that does not exist) and destroyed (when they run empty). Git integration