diff docs/tutorial/slides.md @ 4616:a78310b900e3

docs: change `troubles` references to `instability` Per https://www.mercurial-scm.org/wiki/CEDVocabulary. There are a couple instances of 'troublesome' which probably need a word, as deriviatives of 'instability' didn't really fit. At least some of these are in the unlinked obs-terms.rst page.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 27 Apr 2019 19:42:42 -0400
parents 8406d9b06130
children 803d32f4e498
line wrap: on
line diff
--- a/docs/tutorial/slides.md	Sat Apr 27 19:32:03 2019 -0400
+++ b/docs/tutorial/slides.md	Sat Apr 27 19:42:42 2019 -0400
@@ -1130,9 +1130,9 @@
 
 À deux:
 
-- troubles, divergence, orphan
-- troubles visualization
-- troubles resolution
+- instability, divergence, orphan
+- instability visualization
+- instability resolution
 - collaboration workflow
 
 Parler du happy path d'abord -->
@@ -2025,7 +2025,7 @@
 </table>
 
 
-## Troubles
+## Instability
 
 #### Evolution
 
@@ -2041,7 +2041,7 @@
 
 #### instability
 
-(currently: *troubles*)
+(currently: *instability*)
 
 * **Orphans:** ancestors were rewritten
 
@@ -2091,7 +2091,7 @@
 
 <img src="https://media.giphy.com/media/46vrhWWOJ4wHC/giphy.gif">
 
-## extra - Troubles
+## extra - Instability
 
 #### Obsolete