Change "sub" to "prescription" (or rx)

4 files changed, 21 insertions, 21 deletions

diff --git a/doc/s6_repository.html b/doc/s6_repository.html
index 8d94182..3a46fbc 100644
--- a/doc/s6_repository.html
+++ b/doc/s6_repository.html
@@ -121,14 +121,14 @@ inconsistencies, printing anything it finds to stdout. </li>
 
 <dt> -E, --no-force-essential </dt>
 <dd> If fixing a set involves changing a service flagged as essential
-to a sub that is <em>not</em> <tt>always</tt>, or a service <em>not</em>
-flagged as essential to the <tt>always</tt> sub, print an error message
+to a prescription that is <em>not</em> <tt>always</tt>, or a service <em>not</em>
+flagged as essential to the <tt>always</tt> prescription, print an error message
 and exit. This is the default. </dd>
 
 <dt> -e, --force-essential </dt>
 <dd> If fixing a set involves changing a service flagged as essential
-to a sub that is <em>not</em> <tt>always</tt>, or a service <em>not</em>
-flagged as essential to the <tt>always</tt> sub, perform the change
+to a prescription that is <em>not</em> <tt>always</tt>, or a service <em>not</em>
+flagged as essential to the <tt>always</tt> prescription, perform the change
 and continue. This is normally not necessary with a list of stores
 providing consistent services. </dd>
 
diff --git a/doc/s6_set.html b/doc/s6_set.html
index 3666c65..c20fbd1 100644
--- a/doc/s6_set.html
+++ b/doc/s6_set.html
@@ -139,7 +139,7 @@ default. </dd>
 <ul>
  <li> <tt>s6 set status</tt> lists the services named <em>names...</em>
 in the working set with their current
-<a href="//skarnet.org/software/s6-rc/repodefs.html#sub">sub</a>, i.e.
+<a href="//skarnet.org/software/s6-rc/repodefs.html#rx">prescription</a>, i.e.
 the state that they should be in at boot time: masked, disabled (listed
 as <tt>usable</tt>), enabled (listed as <tt>active</tt>), or essential
 (listed as <tt>always</tt>).
@@ -163,11 +163,11 @@ stores and generally should not be tampered with via <tt>s6 set</tt>
 commands. </li>
   </ul> </li>
  <li> The service name is normally followed by a slash (<tt>/</tt>)
-then the name of the sub the service is in. On a terminal
+then the name of the prescription the service is in. On a terminal
 with util-linux support every line is pretty-printed into columns
 instead. </li>
  <li> If <em>names...</em> is empty, all the services in the set
-are printed along with their subs. </li>
+are printed along with their prescriptions. </li>
 </ul>
 
 <h4> Options </h4>
@@ -203,15 +203,15 @@ currently running database.
 <ul>
  <li> These subcommands are built with the same model and do the same
 thing: they move the services listed in <em>services...</em> from their
-current subs to another.
+current prescriptions to another.
   <ul>
    <li> <tt>mask</tt> hides the services. Masking means that the service will not appear in the live
 service database <em>at all</em>, it will not be listed, it will not be usable until it is unmasked in
 a new working set that is subsequently committed and installed. Masking is useful when the stores
 provide services that come from random installed packages, the user never wants to run these
 services, and it's just better not to see them. </li>
-   <li> <tt>unmask</tt> and <tt>disable</tt> put the services in the <tt>usable</tt> sub, i.e. unmasked and disabled. </li>
-   <li> <tt>enable</tt> puts the services in the <tt>enabled</tt> sub. </li>
+   <li> <tt>unmask</tt> and <tt>disable</tt> put the services in the <tt>usable</tt> prescription, i.e. unmasked and disabled. </li>
+   <li> <tt>enable</tt> puts the services in the <tt>enabled</tt> prescription. </li>
    <li> <tt>make-essential</tt> enables the services and marks them as essential. This command should normally not
 be used: essential services are marked as such in the stores and should not be touched. The command exists for
 troubleshooting purposes. </li>
@@ -240,7 +240,7 @@ or <tt>pull</tt>.
 be inconsistent afterwards, that can be changed by manually changing the dependencies
 or by fixing the set (see below). </li>
   <li> <tt>pull</tt>: resolve inconsistencies by pulling the dependencies into the
-same sub as the listed service. For <tt>enable</tt>,
+same prescription as the listed service. For <tt>enable</tt>,
 service dependencies are made <em>active</em> as well. For <tt>disable</tt>, reverse
 dependencies are disabled as well. For <tt>mask</tt>, reverse dependencies are
 masked as well. </li>
@@ -268,14 +268,14 @@ inconsistencies, printing anything it finds to stdout. </li>
 
 <dt> -E, --no-force-essential </dt>
 <dd> If fixing the set involves changing a service flagged as essential
-to a sub that is <em>not</em> <tt>always</tt>, or a service <em>not</em>
-flagged as essential to the <tt>always</tt> sub, print an error message
+to a prescription that is <em>not</em> <tt>always</tt>, or a service <em>not</em>
+flagged as essential to the <tt>always</tt> prescription, print an error message
 and exit. This is the default. </dd>
 
 <dt> -e, --force-essential </dt>
 <dd> If fixing the set involves changing a service flagged as essential
-to a sub that is <em>not</em> <tt>always</tt>, or a service <em>not</em>
-flagged as essential to the <tt>always</tt> sub, perform the change
+to a prescription that is <em>not</em> <tt>always</tt>, or a service <em>not</em>
+flagged as essential to the <tt>always</tt> prescription, perform the change
 and continue. This is normally not necessary with a list of stores
 providing consistent services. </dd>
 
diff --git a/src/s6-frontend/set.help.txt b/src/s6-frontend/set.help.txt
index 20deb73..362ee9f 100644
--- a/src/s6-frontend/set.help.txt
+++ b/src/s6-frontend/set.help.txt
@@ -5,7 +5,7 @@ Subcommands:
   save		save the current set under a user-provided name
   load		load a previously saved set
   list		list services in the working set
-  status	list services in the working set with their sub
+  status	list services in the working set with their rx
   enable	enable services
   disable	disable services
   mask		mask services (hide them from the db entirely)
@@ -28,7 +28,7 @@ s6 set status options:
 s6 set enable|disable|mask|unmask options:
   -f		--ignore-dependencies		only change listed services
   -n		--dry-run			show what would happen, don't do
-  -I WHAT	--if-dependencies-found=WHAT	WHAT=warn (default) | fail | pull (dependencies will be brought to the same sub)
+  -I WHAT	--if-dependencies-found=WHAT	WHAT=warn (default) | fail | pull (dependencies will be brought to the same rx)
 
 s6 set check options:
   -E		--no-force-essential		do not allow manual changes to essential services (default)
diff --git a/src/s6-frontend/set_change.c b/src/s6-frontend/set_change.c
index 4017329..64b6fbf 100644
--- a/src/s6-frontend/set_change.c
+++ b/src/s6-frontend/set_change.c
@@ -21,8 +21,8 @@ enum gola_e
   GOLA_N
 } ;
 
-static void set_change (char const *const *argv, char const *newsub, char const *cmd) gccattr_noreturn ;
-static void set_change (char const *const *argv, char const *newsub, char const *cmd)
+static void set_change (char const *const *argv, char const *newrx, char const *cmd) gccattr_noreturn ;
+static void set_change (char const *const *argv, char const *newrx, char const *cmd)
 {
   static gol_bool const rgolb[] =
   {
@@ -68,10 +68,10 @@ static void set_change (char const *const *argv, char const *newsub, char const
     newargv[m++] = "-I" ;
     newargv[m++] = wgola[GOLA_FORCELEVEL] ;
   }
-  if (!strcmp(newsub, "always")) newargv[m++] = "-e" ;
+  if (!strcmp(newrx, "always")) newargv[m++] = "-e" ;
   newargv[m++] = "--" ;
   newargv[m++] = "current" ;
-  newargv[m++] = newsub ;
+  newargv[m++] = newrx ;
   for (unsigned int i = 0 ; i < argc ; i++)
     newargv[m++] = argv[i] ;
   newargv[m++] = 0 ;