From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 4 Jun 2018 17:25:37 +0000 (-0700)
Subject: bpo-27902: Add compatibility note to Profile docs (GH-7295)
X-Git-Tag: v3.7.0rc1~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7548a9327409df787eef5f8c2780b53b5788012f;p=thirdparty%2FPython%2Fcpython.git

bpo-27902: Add compatibility note to Profile docs (GH-7295)

(cherry picked from commit f7745e1dcb8e8473cc86112a0213b3f244a07230)

Co-authored-by: Tobias Kunze <r@rixx.de>
---

diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
index a6dc56f43cbc..3f3c8a948562 100644
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -317,11 +317,12 @@ Analysis of the profiler data is done using the :class:`~pstats.Stats` class.
    corresponding version of :mod:`profile` or :mod:`cProfile`.  To be specific,
    there is *no* file compatibility guaranteed with future versions of this
    profiler, and there is no compatibility with files produced by other
-   profilers.  If several files are provided, all the statistics for identical
-   functions will be coalesced, so that an overall view of several processes can
-   be considered in a single report.  If additional files need to be combined
-   with data in an existing :class:`~pstats.Stats` object, the
-   :meth:`~pstats.Stats.add` method can be used.
+   profilers, or the same profiler run on a different operating system.  If
+   several files are provided, all the statistics for identical functions will
+   be coalesced, so that an overall view of several processes can be considered
+   in a single report.  If additional files need to be combined with data in an
+   existing :class:`~pstats.Stats` object, the :meth:`~pstats.Stats.add` method
+   can be used.
 
    Instead of reading the profile data from a file, a :class:`cProfile.Profile`
    or :class:`profile.Profile` object can be used as the profile data source.