Merge from trunkpending

1 files changed, 2 insertions, 3 deletions

diff --git a/admin/notes/nextstep b/admin/notes/nextstep
index 462101f9abf..a2e5ce2c9b0 100644
--- a/admin/notes/nextstep
+++ b/admin/notes/nextstep
@@ -78,12 +78,12 @@ Text Rendering and Font Handling
 nsfont.m implements the font driver, responsible for managing fonts and
 rendering text.  Fonts are obtained through NSFontManager.  Rendering must be
 done at a low level due to emacs' fine control over this process, therefore
-there are different approachs under Cocoa and GNUstep.  Under GNUstep, the
+there are different approaches under Cocoa and GNUstep.  Under GNUstep, the
 original NeXT Display PostScript (DPS) APIs are available and used.  Under
 Cocoa, these were removed and Quartz drawing functions replaced them.
 
 In both cases, font glyphs are accessed through UTF8 character
-representations.  It would be preferable to use unicode indices, but prior
+representations.  It would be preferable to use Unicode indices, but prior
 attempts at this have failed.
 
 Multi-script fontsets are auto-created in nsfont_make_fontset_for_font() using
@@ -156,4 +156,3 @@ EmacsPrefsController : NSObject
 EmacsSavePanel : NSSavePanel
 EmacsOpenPanel : NSOpenPanel
   - utility override for panel notifications
-