Read me file conflicts

Author: kcvemula

README.md

@@ -14,44 +14,20 @@ Pre-requisites:
 - NetBackup 8.1.1 or higher
 - See the script's README for the corresponding requirements and usage
 
-#### Executing the recipes in Perl
 
-Pre-requisites:
-- NetBackup 8.1.2 or higher
-- Perl 5.20.2 or higher
+#### Executing the recipes for different programming languages
 
-Use the following commands to run the perl samples.
-- `perl create_policy_step_by_step.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
-- `perl create_policy_in_one_step.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
-- `perl rbac_filtering_in_policy.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
-- `perl api_requests_images.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
-- `perl api_requests_image_contents.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
-
-#### Executing the recipes in Python
+The `recipes` folder contains code samples to invoke NetBackup REST API using different programming languages. 
 
 Pre-requisites:
-- NetBackup 8.1.2 or higher
-- python 3.5 or higher
-- python modules: `requests`
 
-<<<<<<< HEAD
-#### Executing the recipes in PowerShell
-Pre-requisites:
 - NetBackup 8.1.2 or higher
-- PowerShell 4.0 or higher
+- See the script's README for the corresponding requirements and usage
 
-Use the following commands to run the PowerShell samples.
-- `.\create_policy_in_one_step.ps1 -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
-- `.\rbac_filtering_in_policy.ps1 -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
-=======
-Use the following commands to run the python samples.
-- `python -W ignore create_policy_step_by_step.py -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
-- `python -W ignore create_policy_in_one_step.py -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
-- `python -W ignore rbac_filtering_in_policy.py -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
 
 
 #### Tools
 The `tools` folder contains utilities that have proven useful in the development of projects using
 NetBackup REST APIs, but do not provide any API usage examples.  Again, these tools are not for
 production use, but they may be of some use in your work.
->>>>>>> master
+

recipes/perl/README.md

@@ -0,0 +1,21 @@
+### NetBackup API Code Samples for perl
+
+This directory contains code samples to invoke NetBackup REST APIs using perl.
+
+#### Disclaimer
+
+These scripts are only meant to be used as a reference. If you intend to use them in production, use it at your own risk.
+
+#### Pre-requisites:
+
+- NetBackup 8.1.2 or higher
+- Perl 5.20.2 or higher
+
+#### Executing the recipes in perl
+
+Use the following commands to run the perl samples.
+- `perl create_policy_step_by_step.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
+- `perl create_policy_in_one_step.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
+- `perl rbac_filtering_in_policy.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
+- `perl api_requests_images.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
+- `perl api_requests_image_contents.pl -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`

recipes/powershell/README.md

@@ -0,0 +1,17 @@
+### NetBackup API Code Samples for PowerShell
+
+This directory contains code samples to invoke NetBackup REST APIs using PowerShell.
+
+#### Disclaimer
+
+These scripts are only meant to be used as a reference. If you intend to use them in production, use it at your own risk.
+
+#### Executing the recipes in PowerShell
+
+Pre-requisites:
+- NetBackup 8.1.2 or higher
+- PowerShell 4.0 or higher
+
+Use the following commands to run the PowerShell samples.
+- `.\create_policy_in_one_step.ps1 -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
+- `.\rbac_filtering_in_policy.ps1 -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`

recipes/python/README.md

@@ -0,0 +1,20 @@
+### NetBackup API Code Samples for Python
+
+This directory contains code samples to invoke NetBackup REST APIs using Python.
+
+#### Disclaimer
+
+These scripts are only meant to be used as a reference. If you intend to use them in production, use it at your own risk.
+
+#### Executing the recipes in Python
+
+Pre-requisites:
+- NetBackup 8.1.2 or higher
+- python 3.5 or higher
+- python modules: `requests`
+
+
+Use the following commands to run the python samples.
+- `python -W ignore create_policy_step_by_step.py -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
+- `python -W ignore create_policy_in_one_step.py -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`
+- `python -W ignore rbac_filtering_in_policy.py -nbmaster <masterServer> -username <username> -password <password> [-domainName <domainName>] [-domainType <domainType>]`