May 11, 2021 · May 12, 2021 · May 12, 2021 · May 12, 2021 · May 12, 2021 · May 12, 2021
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
   intended to remove all case distinctions in a string. For example, the German
   lowercase letter ``'ß'`` is equivalent to ``"ss"``. Since it is already
   lowercase, :meth:`lower` would do nothing to ``'ß'``; :meth:`casefold`
   converts it to ``"ss"``.
   converts it to ``"ss"``, as follows::

      >>> 'ß'.casefold()
      'ss'
      >>> 'ß'.lower()
      'ß'

   The casefolding algorithm is
   `described in section 3.13 'Default Case Folding' of the Unicode Standard
 .. method:: str.lower()

   Return a copy of the string with all the cased characters [4]_ converted to
   lowercase.
   lowercase. For example::

      >>> 'Lower Method Example'.lower()
      'lower method example'

   The lowercasing algorithm used is
   `described in section 3.13 'Default Case Folding' of the Unicode Standard
   <https://www.unicode.org/versions/Unicode15.0.0/ch03.pdf>`__.

 <<<<<<< HEAD
 =======
   The lowercasing algorithm used is described in section 3.13 of the Unicode
   Standard.

   See also :meth:`casefold`, :meth:`swapcase` and :meth:`upper`.
 >>>>>>> 58b11f169d ([Doc] Added snippet code to str.upper method)

 .. method:: str.lstrip([chars])

   Return a copy of the string with leading characters removed.  The *chars*
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1643,7 +1643,12 @@ expression support in the :mod:`re` module).
		intended to remove all case distinctions in a string. For example, the German
		lowercase letter ``'ß'`` is equivalent to ``"ss"``. Since it is already
		lowercase, :meth:`lower` would do nothing to ``'ß'``; :meth:`casefold`
		converts it to ``"ss"``.
		converts it to ``"ss"``, as follows::

		>>> 'ß'.casefold()
		'ss'
		>>> 'ß'.lower()
		'ß'

		The casefolding algorithm is
		`described in section 3.13 'Default Case Folding' of the Unicode Standard
Expand DownExpand Up		@@ -1970,20 +1975,15 @@ expression support in the :mod:`re` module).
		.. method:: str.lower()

		Return a copy of the string with all the cased characters [4]_ converted to
		lowercase.
		lowercase. For example::

		>>> 'Lower Method Example'.lower()
		'lower method example'

		The lowercasing algorithm used is
		`described in section 3.13 'Default Case Folding' of the Unicode Standard
		<https://www.unicode.org/versions/Unicode15.0.0/ch03.pdf>`__.

		<<<<<<< HEAD
		=======
		The lowercasing algorithm used is described in section 3.13 of the Unicode
		Standard.

		See also :meth:`casefold`, :meth:`swapcase` and :meth:`upper`.
		>>>>>>> 58b11f169d ([Doc] Added snippet code to str.upper method)

		.. method:: str.lstrip([chars])

		Return a copy of the string with leading characters removed. The chars
Expand Down