Show More
@@ -116,8 +116,7 b' The generated comparison, is between your feature branch' | |||||
116 | ``my-new-feature``, and the place in ``master`` from which you branched |
|
116 | ``my-new-feature``, and the place in ``master`` from which you branched | |
117 | ``my-new-feature``. In other words, you can keep updating ``master`` |
|
117 | ``my-new-feature``. In other words, you can keep updating ``master`` | |
118 | without interfering with the output from the comparison. More detail? |
|
118 | without interfering with the output from the comparison. More detail? | |
119 |
Note the three dots in the URL above (``master...my-new-feature``) |
|
119 | Note the three dots in the URL above (``master...my-new-feature``). | |
120 | see :ref:`dot2-dot3`. |
|
|||
121 |
|
120 | |||
122 | Asking for your changes to be merged with the main repo |
|
121 | Asking for your changes to be merged with the main repo | |
123 | ======================================================= |
|
122 | ======================================================= |
@@ -26,3 +26,4 b' on the IPython GitHub wiki.' | |||||
26 | parallel_connections |
|
26 | parallel_connections | |
27 | pycompat |
|
27 | pycompat | |
28 | config |
|
28 | config | |
|
29 | inputhook_app |
@@ -547,7 +547,7 b' Backwards incompatible changes' | |||||
547 |
|
547 | |||
548 | * Old style configuration files :file:`ipythonrc` and :file:`ipy_user_conf.py` |
|
548 | * Old style configuration files :file:`ipythonrc` and :file:`ipy_user_conf.py` | |
549 | are no longer supported. Users should migrate there configuration files to |
|
549 | are no longer supported. Users should migrate there configuration files to | |
550 | the new format described :doc:`here <config/intro>` and |
|
550 | the new format described :doc:`here </config/intro>` and | |
551 | :ref:`here <config_overview>`. |
|
551 | :ref:`here <config_overview>`. | |
552 |
|
552 | |||
553 | * The old IPython extension API that relied on :func:`ipapi` has been |
|
553 | * The old IPython extension API that relied on :func:`ipapi` has been |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now