Merge branch 'maint'

doc/org.texi

@@ -6887,9 +6887,9 @@ down the list to stuff that fits into an available time slot.
 @cindex countdown timer
 @kindex ;
 
-Org provides provides two types of timers.  There is a relative timer that
-counts up, which can be useful when taking notes during, for example, a
-meeting or a video viewing.  There is also a countdown timer.
+Org provides two types of timers.  There is a relative timer that counts up,
+which can be useful when taking notes during, for example, a meeting or
+a video viewing.  There is also a countdown timer.
 
 The relative and countdown are started with separate commands.