From c81ee4a99dfbd65b6ccde5a2d3fee9dd3caf5fc1 Mon Sep 17 00:00:00 2001
From: Nathan Olla <ollan@deshawresearch.com>
Date: Wed, 16 Jul 2014 15:21:07 -0400
Subject: Add some basic documentation for SYSV packages over HTTP

---
 doc/client/tools.txt | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'doc/client/tools.txt')

diff --git a/doc/client/tools.txt b/doc/client/tools.txt
index 1dbb33b1a..11f1d72cc 100644
--- a/doc/client/tools.txt
+++ b/doc/client/tools.txt
@@ -154,7 +154,32 @@ Systemd service support.
 SYSV
 ----
 
-Handles System V Packaging format that is available on Solaris.
+Handles `System V Packaging <http://docs.oracle.com/cd/E19683-01/806-7008/index.html>`_ format that is available on Solaris.
+
+.. note::
+
+  If the Packages specified in the PackageList are datastream format packages distributed via HTTP, you must specify a simplename attribute.   Such packages will be downloaded and installed from a local path.
+
+  datastream format over HTTP:
+
+  .. code-block:: xml
+
+     <PackageList url='http://install/packages' type='sysv' priority='0'>
+       <Group name='solaris10'>
+         <Package name='SCbcfg2' version='1.3.4' simplename='bcfg-1.3.4-1' />
+       </Group>
+     </PackageList>
+
+  File system format over NFS or local path:
+
+  .. code-block:: xml
+
+     <PackageList url='/mnt/install/packages' type='sysv' priority='0'>
+       <Group name='solaris10'>
+         <Package name='SCbcfg2' version='1.3.4' />
+       </Group>
+     </PackageList>
+
 
 Upstart
 -------
-- 
cgit v1.2.3-1-g7c22


From af0d30e03bcd7c40931aaa27536a75daa18f4134 Mon Sep 17 00:00:00 2001
From: Nathan Olla <ollan@deshawresearch.com>
Date: Wed, 16 Jul 2014 15:27:42 -0400
Subject: Remove group tag from examples

---
 doc/client/tools.txt | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'doc/client/tools.txt')

diff --git a/doc/client/tools.txt b/doc/client/tools.txt
index 11f1d72cc..ce8732454 100644
--- a/doc/client/tools.txt
+++ b/doc/client/tools.txt
@@ -165,9 +165,7 @@ Handles `System V Packaging <http://docs.oracle.com/cd/E19683-01/806-7008/index.
   .. code-block:: xml
 
      <PackageList url='http://install/packages' type='sysv' priority='0'>
-       <Group name='solaris10'>
          <Package name='SCbcfg2' version='1.3.4' simplename='bcfg-1.3.4-1' />
-       </Group>
      </PackageList>
 
   File system format over NFS or local path:
@@ -175,9 +173,7 @@ Handles `System V Packaging <http://docs.oracle.com/cd/E19683-01/806-7008/index.
   .. code-block:: xml
 
      <PackageList url='/mnt/install/packages' type='sysv' priority='0'>
-       <Group name='solaris10'>
          <Package name='SCbcfg2' version='1.3.4' />
-       </Group>
      </PackageList>
 
 
-- 
cgit v1.2.3-1-g7c22


From dccd33a479c0ff14d90d2939534f91964e1a393c Mon Sep 17 00:00:00 2001
From: Michael Fenn <fennm@deshawresearch.com>
Date: Thu, 6 Nov 2014 14:05:42 -0500
Subject: SYSV: change instances of simplename to simplefile

This is to better match the schema since simplefile already exists. The
previous simplename attribute would fail validation. Since pkgmgr
already helpfully constructs url for you if simplefile exists, the tool
no longer needs to do the concatenation itself.

Given the low usage rate of SYSV.py and that the original functionality
was introduced in a late 1.3 release, changing the name w/o providing
backwards compatiblity seems reasonable.
---
 doc/client/tools.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/client/tools.txt')

diff --git a/doc/client/tools.txt b/doc/client/tools.txt
index ce8732454..26841ab11 100644
--- a/doc/client/tools.txt
+++ b/doc/client/tools.txt
@@ -158,14 +158,14 @@ Handles `System V Packaging <http://docs.oracle.com/cd/E19683-01/806-7008/index.
 
 .. note::
 
-  If the Packages specified in the PackageList are datastream format packages distributed via HTTP, you must specify a simplename attribute.   Such packages will be downloaded and installed from a local path.
+  If the Packages specified in the PackageList are datastream format packages distributed via HTTP, you must specify a simplefile attribute.   Such packages will be downloaded and installed from a local path.
 
   datastream format over HTTP:
 
   .. code-block:: xml
 
      <PackageList url='http://install/packages' type='sysv' priority='0'>
-         <Package name='SCbcfg2' version='1.3.4' simplename='bcfg-1.3.4-1' />
+         <Package name='SCbcfg2' version='1.3.4' simplefile='bcfg-1.3.4-1' />
      </PackageList>
 
   File system format over NFS or local path:
-- 
cgit v1.2.3-1-g7c22


From ddf888ec1237fb27c329f9e667c791ee7c257720 Mon Sep 17 00:00:00 2001
From: Michael Fenn <fennm@deshawresearch.com>
Date: Thu, 6 Nov 2014 15:19:18 -0500
Subject: doc: Update SYSV datastream format docs

---
 doc/client/tools.txt | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'doc/client/tools.txt')

diff --git a/doc/client/tools.txt b/doc/client/tools.txt
index 26841ab11..170b30b2e 100644
--- a/doc/client/tools.txt
+++ b/doc/client/tools.txt
@@ -158,13 +158,21 @@ Handles `System V Packaging <http://docs.oracle.com/cd/E19683-01/806-7008/index.
 
 .. note::
 
-  If the Packages specified in the PackageList are datastream format packages distributed via HTTP, you must specify a simplefile attribute.   Such packages will be downloaded and installed from a local path.
+  If the Packages specified in the PackageList are datastream format
+  packages distributed via HTTP, you must specify a simplefile attribute.
+  Such packages will be downloaded and installed from a local path.
 
-  datastream format over HTTP:
+  Note the use of the uri attribute in the datastream format example.  If
+  the simplefile attribute exists, the
+  :ref:`Pkgmgr <server-plugins-generators-pkgmgr>` plugin will
+  automatically construct the url attribute by concatenating the uri and
+  simplefile attributes (with an intervening slash).
+
+  Datastream format over HTTP:
 
   .. code-block:: xml
 
-     <PackageList url='http://install/packages' type='sysv' priority='0'>
+     <PackageList uri='http://install/packages' type='sysv' priority='0'>
          <Package name='SCbcfg2' version='1.3.4' simplefile='bcfg-1.3.4-1' />
      </PackageList>
 
-- 
cgit v1.2.3-1-g7c22