Resolve python markdown conflict & fix typo

specification/containerservice/resource-manager/readme.java.md

@@ -45,7 +45,7 @@ batch:
 These settings apply only when `--tag=package-2021-07` is specified on the command line.
 Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2021-05' && $(java) && $(multiapi)
+``` yaml $(tag) == 'package-2021-07' && $(java) && $(multiapi)
 java:
   namespace: com.microsoft.azure.management.containerservice.v2021_07_01
   output-folder: $(azure-libraries-for-java-folder)/sdk/containerservice/mgmt-v2021_07_01

specification/containerservice/resource-manager/readme.python.md

@@ -2,20 +2,11 @@
 
 These settings apply only when `--python` is specified on the command line.
 
-```yaml $(python) && !$(track2)
-python:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  payload-flattening-threshold: 2
-  package-name: azure-mgmt-containerservice
-  clear-output-folder: true
-  no-namespace-folders: true
-```
-
 ```yaml $(python) && $(track2)
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
 package-name: azure-mgmt-containerservice
+package-verion: 1.0.0b1
 clear-output-folder: true
 no-namespace-folders: true
 ```
@@ -24,36 +15,6 @@ no-namespace-folders: true
 
 Generate all API versions currently shipped for this package
 
-```yaml $(python) && $(multiapi) && !$(track2)
-batch:
-  - tag: package-2021-07-01-only
-  - tag: package-2021-05-01-only
-  - tag: package-2021-03-01-only
-  - tag: package-2021-02-01-only
-  - tag: package-2020-12-01-only
-  - tag: package-2020-11-01-only
-  - tag: package-2020-09-01-only
-  - tag: package-2020-07-01-only
-  - tag: package-2020-06-01-only
-  - tag: package-2020-04-01-only
-  - tag: package-2020-03-01-only
-  - tag: package-2020-02-01-only
-  - tag: package-2020-01-01-only
-  - tag: package-2019-11-01-only
-  - tag: package-2019-10-27-preview-only
-  - tag: package-2019-10-01-only
-  - tag: package-2019-08-01-only
-  - tag: package-2019-06-01-only
-  - tag: package-2019-04-30-only
-  - tag: package-2019-04-01-only
-  - tag: package-2019-02-only
-  - tag: package-2018-09-preview-only
-  - tag: package-2019-09-preview-only
-  - tag: package-2018-08-preview-only
-  - tag: package-2018-03-only
-  - tag: package-2017-07-only-extended
-```
-
 ```yaml $(python) && $(multiapi) && $(track2)
 batch:
   - tag: package-2021-07-01-only
@@ -96,10 +57,7 @@ perform-load: false
 These settings apply only when `--tag=package-2021-07-01-only --python` is specified on the command line.
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
-``` yaml $(tag) == 'package-2021-05-01-only' && $(python)
-python:
-  namespace: azure.mgmt.containerservice.v2021_07_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_07_01
+``` yaml $(tag) == 'package-2021-07-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2021_07_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_07_01
 ```
@@ -110,9 +68,6 @@ These settings apply only when `--tag=package-2021-05-01-only --python` is speci
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
 ``` yaml $(tag) == 'package-2021-05-01-only' && $(python)
-python:
-  namespace: azure.mgmt.containerservice.v2021_05_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_05_01
 namespace: azure.mgmt.containerservice.v2021_05_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_05_01
 ```
@@ -123,9 +78,6 @@ These settings apply only when `--tag=package-2021-03-01-only --python` is speci
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
 ``` yaml $(tag) == 'package-2021-03-01-only' && $(python)
-python:
-  namespace: azure.mgmt.containerservice.v2021_03_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_03_01
 namespace: azure.mgmt.containerservice.v2021_03_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_03_01
 ```
@@ -136,9 +88,6 @@ These settings apply only when `--tag=package-2021-02-01-only --python` is speci
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
 ``` yaml $(tag) == 'package-2021-02-01-only' && $(python)
-python:
-  namespace: azure.mgmt.containerservice.v2021_02_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_02_01
 namespace: azure.mgmt.containerservice.v2021_02_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_02_01
 ```
@@ -149,9 +98,6 @@ These settings apply only when `--tag=package-2020-12-01-only --python` is speci
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
 ``` yaml $(tag) == 'package-2020-12-01-only' && $(python)
-python:
-  namespace: azure.mgmt.containerservice.v2020_12_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_12_01
 namespace: azure.mgmt.containerservice.v2020_12_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_12_01
 ```
@@ -162,9 +108,6 @@ These settings apply only when `--tag=package-2020-11-01-only --python` is speci
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
 ``` yaml $(tag) == 'package-2020-11-01-only' && $(python)
-python:
-  namespace: azure.mgmt.containerservice.v2020_11_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_11_01
 namespace: azure.mgmt.containerservice.v2020_11_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_11_01
 ```
@@ -175,9 +118,6 @@ These settings apply only when `--tag=package-2020-09-01-only --python` is speci
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
 ``` yaml $(tag) == 'package-2020-09-01-only' && $(python)
-python:
-  namespace: azure.mgmt.containerservice.v2020_09_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_09_01
 namespace: azure.mgmt.containerservice.v2020_09_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_09_01
 ```
@@ -188,9 +128,6 @@ These settings apply only when `--tag=package-2020-07-01-only --python` is speci
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
 ``` yaml $(tag) == 'package-2020-07-01-only' && $(python)
-python:
-  namespace: azure.mgmt.containerservice.v2020_07_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_07_01
 namespace: azure.mgmt.containerservice.v2020_07_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_07_01
 ```
@@ -203,9 +140,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2020-06-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2020_06_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_06_01
-python:
-  namespace: azure.mgmt.containerservice.v2020_06_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_06_01
 ```
 
 ### Tag: package-2020-04-01-only and python
@@ -216,9 +150,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2020-04-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2020_04_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_04_01
-python:
-  namespace: azure.mgmt.containerservice.v2020_04_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_04_01
 ```
 
 ### Tag: package-2020-03-01-only and python
@@ -229,9 +160,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2020-03-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2020_03_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_03_01
-python:
-  namespace: azure.mgmt.containerservice.v2020_03_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_03_01
 ```
 
 ### Tag: package-2020-02-01-only and python
@@ -242,9 +170,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2020-02-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2020_02_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_02_01
-python:
-  namespace: azure.mgmt.containerservice.v2020_02_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_02_01
 ```
 
 ### Tag: package-2020-01-01-only and python
@@ -255,9 +180,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2020-01-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2020_01_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_01_01
-python:
-  namespace: azure.mgmt.containerservice.v2020_01_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_01_01
 ```
 
 ### Tag: package-2019-11-01-only and python
@@ -268,9 +190,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2019-11-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2019_11_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_11_01
-python:
-  namespace: azure.mgmt.containerservice.v2019_11_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_11_01
 ```
 
 ### Tag: package-2019-10-27-preview-only and python
@@ -281,9 +200,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2019-10-27-preview-only' && $(python)
 namespace: azure.mgmt.containerservice.v2019_10_27_preview
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_10_27_preview
-python:
-  namespace: azure.mgmt.containerservice.v2019_10_27_preview
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_10_27_preview
 ```
 
 ### Tag: package-2019-10-01-only and python
@@ -294,9 +210,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2019-10-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2019_10_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_10_01
-python:
-  namespace: azure.mgmt.containerservice.v2019_10_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_10_01
 ```
 
 ### Tag: package-2019-08-01-only and python
@@ -307,9 +220,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2019-08-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2019_08_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_08_01
-python:
-  namespace: azure.mgmt.containerservice.v2019_08_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_08_01
 ```
 
 ### Tag: package-2019-06-01-only and python
@@ -320,9 +230,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2019-06-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2019_06_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_06_01
-python:
-  namespace: azure.mgmt.containerservice.v2019_06_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_06_01
 ```
 
 ### Tag: package-2019-04-30-only and python
@@ -333,9 +240,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2019-04-30-only' && $(python)
 namespace: azure.mgmt.containerservice.v2019_04_30
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_30
-python:
-  namespace: azure.mgmt.containerservice.v2019_04_30
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_30
 ```
 
 ### Tag: package-2019-04-01-only and python
@@ -346,9 +250,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2019-04-01-only' && $(python)
 namespace: azure.mgmt.containerservice.v2019_04_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_01
-python:
-  namespace: azure.mgmt.containerservice.v2019_04_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_01
 ```
 
 ### Tag: package-2019-02-only and python
@@ -359,9 +260,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2019-02-only' && $(python)
 namespace: azure.mgmt.containerservice.v2019_02_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_02_01
-python:
-  namespace: azure.mgmt.containerservice.v2019_02_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_02_01
 ```
 
 ### Tag: package-2018-09-preview-only and python
@@ -372,9 +270,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2018-09-preview-only' && $(python)
 namespace: azure.mgmt.containerservice.v2018_09_30_preview
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_09_30_preview
-python:
-  namespace: azure.mgmt.containerservice.v2018_09_30_preview
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_09_30_preview
 ```
 
 ### Tag: package-2018-08-preview-only and python
@@ -385,9 +280,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2018-08-preview-only' && $(python)
 namespace: azure.mgmt.containerservice.v2018_08_01_preview
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_08_01_preview
-python:
-  namespace: azure.mgmt.containerservice.v2018_08_01_preview
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_08_01_preview
 ```
 
 ### Tag: package-2018-03-only and python
@@ -398,9 +290,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2018-03-only' && $(python)
 namespace: azure.mgmt.containerservice.v2018_03_31
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_03_31
-python:
-  namespace: azure.mgmt.containerservice.v2018_03_31
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_03_31
 ```
 
 ### Tag: package-2017-07-only-extended and python
@@ -411,9 +300,6 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2017-07-only-extended' && $(python)
 namespace: azure.mgmt.containerservice.v2017_07_01
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2017_07_01
-python:
-  namespace: azure.mgmt.containerservice.v2017_07_01
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2017_07_01
 ```
 
 ### Tag: package-2019-09-preview-only and python
@@ -424,7 +310,4 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
 ``` yaml $(tag) == 'package-2019-09-preview-only' && $(python)
 namespace: azure.mgmt.containerservice.v2019_09_30_preview
 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_09_30_preview
-python:
-  namespace: azure.mgmt.containerservice.v2019_09_30_preview
-  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_09_30_preview
 ```