Merge branch 'bugfix/from_github' into 'master'

Bugfixes from GitHub

See merge request idf/esp-idf!4607

components/nvs_flash/README.rst

@@ -51,7 +51,7 @@ NVS is not directly compatible with the ESP32 flash encryption system. However,
 
 If NVS encryption is not used, it is possible for anyone with physical access to the flash chip to alter, erase, or add key-value pairs. With NVS encryption enabled, it is not possible to alter or add a key-value pair and get recognized as a valid pair without knowing corresponding NVS encryption keys. However, there is no tamper-resistance against erase operation.
 
-The library does try to recover from conditions when flash memory is in an inconsistent state. In particular, one should be able to power off the device at any point and time and then power it back on. This should not result in loss of data, expect for the new key-value pair if it was being written at the moment of power off. The library should also be able to initialize properly with any random data present in flash memory.
+The library does try to recover from conditions when flash memory is in an inconsistent state. In particular, one should be able to power off the device at any point and time and then power it back on. This should not result in loss of data, except for the new key-value pair if it was being written at the moment of power off. The library should also be able to initialize properly with any random data present in flash memory.
 
 Internals
 ---------

docs/en/api-reference/peripherals/ledc.rst

@@ -139,7 +139,7 @@ For additional details regarding speed modes please refer to `ESP32 Technical Re
 Supported Range of Frequency and Duty Resolution
 ------------------------------------------------
 
-The LED PWM Controller is designed primarily to drive LEDs and provides wide resolution of PWM duty settings. For instance for the PWM frequency at 5 kHz, the maximum duty resolution is 13 bits. It means that the duty may be set anywhere from 0 to 100% with resolution of ~0.012% (13 ** 2 = 8192 discrete levels of the LED intensity).
+The LED PWM Controller is designed primarily to drive LEDs and provides wide resolution of PWM duty settings. For instance for the PWM frequency at 5 kHz, the maximum duty resolution is 13 bits. It means that the duty may be set anywhere from 0 to 100% with resolution of ~0.012% (2 ** 13 = 8192 discrete levels of the LED intensity).
 
 The LEDC may be used for providing signals at much higher frequencies to clock other devices, e.g. a digital camera module. In such a case the maximum available frequency is 40 MHz with duty resolution of 1 bit. This means that duty is fixed at 50% and cannot be adjusted.
 

examples/peripherals/mcpwm/mcpwm_servo_control/README.md

@@ -6,11 +6,11 @@ Assign pulse width range and the maximum degree, accordingly the servo will move
  
 
 ## Step 1: Pin assignment
-* GPIO15 is assigned as the MCPWM signal for servo motor 
+* GPIO18 is assigned as the MCPWM signal for servo motor 
 
 
 ## Step 2: Connection
-* connect GPIO15 with servo pwm signal
+* connect GPIO18 with servo pwm signal
 * other two wires of servo motor are VCC and GND