diff --git a/.gitignore b/.gitignore index 648b93b0696..abaef83e455 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 477639fa8d7..cc4f0e43b9b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -59,7 +59,7 @@ repos: - id: mixed-line-ending exclude: \.(cs|xml)$ - id: trailing-whitespace - files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|xml|yaml|yml)$ + files: \.(bat|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$ args: [--markdown-linebreak-ext=md] exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$ - repo: https://github.com/codespell-project/codespell diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 59436d36a27..a6d006938f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -103,7 +103,7 @@ $ git push origin main $ git push origin feature_x ``` -Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request. +Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request. To initiate the pull request, do the following: diff --git a/debian/cloudstack-cli.install b/debian/cloudstack-cli.install index 978b68af62a..13a83393a91 100644 --- a/debian/cloudstack-cli.install +++ b/debian/cloudstack-cli.install @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/debian/cloudstack-docs.install b/debian/cloudstack-docs.install index 978b68af62a..13a83393a91 100644 --- a/debian/cloudstack-docs.install +++ b/debian/cloudstack-docs.install @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/services/console-proxy/rdpconsole/rdp-config.bat b/services/console-proxy/rdpconsole/rdp-config.bat index 614ee236c8a..8bf0f6e6003 100755 --- a/services/console-proxy/rdpconsole/rdp-config.bat +++ b/services/console-proxy/rdpconsole/rdp-config.bat @@ -5,9 +5,9 @@ rem regarding copyright ownership. The ASF licenses this file rem to you under the Apache License, Version 2.0 (the rem "License"); you may not use this file except in compliance rem with the License. You may obtain a copy of the License at -rem +rem rem http://www.apache.org/licenses/LICENSE-2.0 -rem +rem rem Unless required by applicable law or agreed to in writing, rem software distributed under the License is distributed on an rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,10 +15,10 @@ rem KIND, either express or implied. See the License for the rem specific language governing permissions and limitations rem under the License. -rem +rem rem Configure and start RDP service. Run this script on RDP server. -rem - +rem + rem Turn off firewall netsh advfirewall firewall set rule group="Remote Desktop" new enable=yes diff --git a/services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat b/services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat index f5afc0c4ae4..c23476a71e5 100755 --- a/services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat +++ b/services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat @@ -15,20 +15,20 @@ rem KIND, either express or implied. See the License for the rem specific language governing permissions and limitations rem under the License. -rem +rem rem Configure and start RDP service. rem Configure RPD service to use custom key instead of autogenerated for Wireshark and Network Monitor Decrypt Expert. rem rdp.pfx is necessary because it fingerprints are hardcoded in this script. -rem +rem rem Turn off firewall netsh advfirewall firewall set rule group="Remote Desktop" new enable=yes rem Enable TS connections -rem +rem rem Windows Registry Editor Version 5.00 -rem +rem rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server] rem "AllowTSConnections"=dword:00000001 rem "fDenyTSConnections"=dword:00000000 @@ -57,7 +57,7 @@ certutil -p test -importPFX "Remote Desktop" rdp.pfx rem Configure RDP server to use certificate: rem Windows Registry Editor Version 5.00 -rem +rem rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp] rem "SSLCertificateSHA1Hash"=hex:c1,70,84,70,bc,56,42,0a,bb,f4,35,35,ba,a6,09,b0,4e,98,4a,47 reg add "HKLM\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v "SSLCertificateSHA1Hash" /t REG_HEX /d "" /f @@ -73,13 +73,13 @@ rem certutil -store -v My certutil -store -v "Remote Desktop" rem Disable TLS 1.1 (for Network Monitor Decrypt Expert) -rem +rem rem Windows Registry Editor Version 5.00 -rem +rem rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Client] rem "Enabled"=dword:00000000 rem "DisabledByDefault"=dword:00000001 -rem +rem rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Server] rem "Enabled"=dword:00000000 rem "DisabledByDefault"=dword:00000001 @@ -91,13 +91,13 @@ reg add "HKLM\System\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protoc rem Disable TLS 1.2 (for Network Monitor Decrypt Expert) -rem +rem rem Windows Registry Editor Version 5.00 -rem +rem rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Client] rem "Enabled"=dword:00000000 rem "DisabledByDefault"=dword:00000001 -rem +rem rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Server] rem "Enabled"=dword:00000000 rem "DisabledByDefault"=dword:00000001 @@ -135,4 +135,4 @@ rem dism /online /enable-feature /featurename:NetFx3 rem PS. rem Don't forget to set Windows profile as active in Network Monitor, so SSL traffic branch will appear under rem svnchost.exe, so you will be able to decrypt it (don't forget to save and reopen captured traffic to file first). -rem +rem diff --git a/test/scripts/run.bat b/test/scripts/run.bat index a21851ddf2d..f0cb9ff0069 100644 --- a/test/scripts/run.bat +++ b/test/scripts/run.bat @@ -5,9 +5,9 @@ rem regarding copyright ownership. The ASF licenses this file rem to you under the Apache License, Version 2.0 (the rem "License"); you may not use this file except in compliance rem with the License. You may obtain a copy of the License at -rem +rem rem http://www.apache.org/licenses/LICENSE-2.0 -rem +rem rem Unless required by applicable law or agreed to in writing, rem software distributed under the License is distributed on an rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/tools/apidoc/generatecommand.xsl b/tools/apidoc/generatecommand.xsl index e610d092bad..9cc22102200 100644 --- a/tools/apidoc/generatecommand.xsl +++ b/tools/apidoc/generatecommand.xsl @@ -36,17 +36,17 @@ version="1.0">
- Downloads | News | Contact Us + Downloads | News | Contact Us
- +
- +
@@ -62,11 +62,11 @@ version="1.0">
- +
- +
@@ -77,12 +77,12 @@ version="1.0">
- +
-
+

Request parameters

@@ -101,16 +101,16 @@ version="1.0">
- - -
+ + +

Response Tags

- + @@ -125,24 +125,24 @@ version="1.0"> - - + + - - - - - + + + + +
Response Name Description
- - -
+ +
- - +
+ +
- + - - + + +