From cdf4061ff67e70354239acdad21243c120070293 Mon Sep 17 00:00:00 2001 From: Allan Bowe <> Date: Sat, 25 Jan 2020 20:42:11 +0100 Subject: [PATCH] docs: group updates --- docs/dcc-groups.md | 4 ++++ docs/dcc-security.md | 6 ++---- docs/dcc-tables.md | 2 +- docs/dci-frontend.md | 2 +- docs/evaluation-licence-agreement.md | 11 +++++------ docs/licences.md | 4 ++-- mkdocs.yml | 8 ++++++-- 7 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 docs/dcc-groups.md diff --git a/docs/dcc-groups.md b/docs/dcc-groups.md new file mode 100644 index 0000000..b00dbd3 --- /dev/null +++ b/docs/dcc-groups.md @@ -0,0 +1,4 @@ +# Data Controller for SAS® - Adding Groups + +## Overview +By default, Data Controller will work with the SAS Groups defined in metadata. It is also possible to define custom groups with Data Controller itself - to do this simply add the user and group name (and optionally, a group description) in the `DATACTRL.MPE_GROUPS` table. diff --git a/docs/dcc-security.md b/docs/dcc-security.md index 2e51d3c..68c81c2 100644 --- a/docs/dcc-security.md +++ b/docs/dcc-security.md @@ -26,15 +26,13 @@ Before adding a group to Data Controller, it helps to know the members of that g 1 - Use SAS Management Console -2 - Deploy the [Boemska User Navigator](https://github.com/Boemska/user-navigator) - -3 - Use Code +2- Use Code The "code" option can be performed as follows: ``` /* get macro library */ -filename mc url "https://raw.githubusercontent.com/Boemska/macrocore/master/macrocore.sas"; +filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/macrocore.sas"; %inc mc; /* call macro */ %mm_getgroupmembers(YOURGROUPNAME) diff --git a/docs/dcc-tables.md b/docs/dcc-tables.md index e444377..6340a2d 100644 --- a/docs/dcc-tables.md +++ b/docs/dcc-tables.md @@ -13,7 +13,7 @@ Adding tables to the Data Controller is a matter of configuration, specifically Each table to be edited in the Data Controller is represented by one record in `DATACTRL.MPE_TABLES`. The fields should be populated as follows: ### LIBREF -The libref of the table. If not pre-assigned, DC will assign it at runtime using the first definition found in metadata, using this [macro](https://github.com/Boemska/macrocore/blob/master/meta/mm_assigndirectlib.sas). +The libref of the table. If not pre-assigned, DC will assign it at runtime using the first definition found in metadata, using this [macro](https://github.com/macropeople/macrocore/blob/master/meta/mm_assigndirectlib.sas). ### DSN The dataset (table) name as visible when assigning a direct libref connection to `LIBREF`. diff --git a/docs/dci-frontend.md b/docs/dci-frontend.md index f6a0612..ace4bd8 100644 --- a/docs/dci-frontend.md +++ b/docs/dci-frontend.md @@ -1,7 +1,7 @@ # Data Controller for SAS® - Frontend Deployment ## Overview -The Data Controller front end was built on the Angular seed app from Boemska AppFactory®. As such it comes bundled with standard features such as log handling and SASLogon redirects. It is deployed the the root of the SAS Web Server (mid-tier), typically `htdocs`. +The Data Controller front end comes pre-built, and ready to deploy to the root of the SAS Web Server (mid-tier), typically `htdocs`. ## Instructions diff --git a/docs/evaluation-licence-agreement.md b/docs/evaluation-licence-agreement.md index 6e946e1..bc6c7f8 100644 --- a/docs/evaluation-licence-agreement.md +++ b/docs/evaluation-licence-agreement.md @@ -1,8 +1,7 @@ # Data Controller for SAS® Evaluation Agreement +The terms and conditions contained below constitute a legal agreement. This agreement ("Agreement") contains herein the entire agreement between the licensee ("You") and Macro People Ltd ("Macro People Ltd"). Read this agreement carefully. By downloading, installing, and/or examining the product, you acknowledge: -THE TERMS AND CONDITIONS CONTAINED BELOW CONSTITUTE A LEGAL AGREEMENT. THIS AGREEMENT ("AGREEMENT") CONTAINS THE ENTIRE AGREEMENT BETWEEN THE LICENSEE ("YOU") AND MACRO PEOPLE LTD ("MACRO PEOPLE LTD") WITH REGARD TO THE TERMS AND CONDITIONS DESCRIBED BELOW. READ THIS AGREEMENT CAREFULLY. BY DOWNLOADING, INSTALLING, AND/OR EXAMINING THE PRODUCT, YOU ACKNOWLEDGE: - -1 - YOU ARE AUTHORIZED TO ENTER THIS AGREEMENT FOR AND ON BEHALF OF YOUR COMPANY, AND ARE DOING SO, AND 2 - YOU HAVE READ, UNDERSTAND AND AGREE THAT YOU AND THE COMPANY SHALL BE BOUND BY THESE TERMS AND CONDITIONS AND EVERY MODIFICATION AND ADDITION PROVIDED FOR +1 - You are authorized to enter this agreement for and on behalf of your company, and are doing so, and 2 - You have read, understand and agree that you and the company shall be bound by these terms and conditions and every modification and addition provided for. Software products included with this product that are not Macro People Ltd products are licensed to you by the software provider. Please refer to the license contained in the provider’s product for their terms of use. @@ -18,11 +17,10 @@ The Software and related documentation are protected by United Kingdom copyright ## 4. Use of Name and Trademarks. You shall not use the name, trade names or trademarks of Macro People Ltd or any of its affiliates in any advertising, promotional literature or any other material, whether in written, electronic or other form, without prior approval. -## 5.Restrictions - +## 5. Restrictions 5.1 - You may not rent, lease, lend, redistribute or sublicense the Software. You may not copy the Software other than to make archival or backup copies - provided that the backup copy includes all copyright or other proprietary notices contained on the original. You may not copy related product documentation. You may not modify, reverse engineer, decompile, or disassemble the Software, except to the extent the such restriction is expressly prohibited by applicable law. -5.2 - Certain components of the Software are provided under various Open Source licenses that have been made available to Kony. You may modify or replace only these Open-Sourced Components; provided that (i) the resultant Software is used in place of the unmodified Software, on a single computer; and (ii) you otherwise comply with the terms of this License and any applicable licensing terms governing use of the Open-Sourced Components. Macro People Ltd is not obligated to provide any maintenance, technical or other support for the resultant Software. +5.2 - Certain components of the Software are provided under various Open Source licenses that have been made available to Macro People Ltd. You may modify or replace only these Open-Sourced Components; provided that (i) the resultant Software is used in place of the unmodified Software, on a single computer; and (ii) you otherwise comply with the terms of this License and any applicable licensing terms governing use of the Open-Sourced Components. Macro People Ltd is not obligated to provide any maintenance, technical or other support for the resultant Software. ## 6. Exclusion of Warranties. THE SOFTWARE IS PROVIDED TO LICENSEE “AS IS”, AND ANY USE BY LICENSEE OF THE SOFTWARE WILL BE AT LICENSEE’S SOLE RISK. Macro People Ltd makes no warrranties relating to the softwtare, and disclaims all warranties (express or implied), including without limitation those of merchantability and fitness for any particular purpose. @@ -32,6 +30,7 @@ In no event shall Macro People Ltd be liable for any incidental, special, indire ## 8. Governing law and jurisdiction 8.1 - This agreement and any disputes or claims arising out of or in connection with its subject matter are governed by and construed in accordance with the law of England. + 8.2 - The parties irrevocably agree that the courts of England have exclusive jurisdiction to settle any dispute or claim that arises out of or in connection with this agreement. diff --git a/docs/licences.md b/docs/licences.md index bb00eb2..36a65a4 100644 --- a/docs/licences.md +++ b/docs/licences.md @@ -3,7 +3,7 @@ ## Overview Data Controller uses the following licences: -``` + ├─ @angular-devkit/architect@0.13.7 │ ├─ licenses: MIT │ ├─ repository: https://github.com/angular/angular-cli @@ -8547,4 +8547,4 @@ Data Controller uses the following licences: ├─ repository: https://github.com/strongloop/zone ├─ path: /Users/allan/git/dcfrontend/node_modules/zone └─ licenseFile: /Users/allan/git/dcfrontend/node_modules/zone/LICENSE.md -``` + diff --git a/mkdocs.yml b/mkdocs.yml index 3ddf395..c3b5f68 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -11,12 +11,16 @@ pages: - Selectboxes: dcc-selectbox.md - Dates / Datetimes: dcc-dates.md - Emails: emails.md + - Groups: groups.md - Installing Data Controller: - System Requirements: dci-requirements.md - Backend: dci-backend.md - Frontend: dci-frontend.md - Troubleshooting: dci-troubleshooting.md - - Evaluation Version: dci-evaluation.md +- Evaluation (Demo) Version: + - Installation: dci-evaluation.md + - Evaluation Licence: evaluation-licence-agreement.md + - Other Licences: licences.md markdown_extensions: - admonition @@ -43,4 +47,4 @@ theme: code: 'Ubuntu Mono' favicon: img/favicon.ico custom_dir: 'theme' -copyright: All rights reserved ©2018 Macro People Ltd. +copyright: All rights reserved ©2020 Macro People Ltd.