Merge from trunk.

[gnu-emacs] / admin / notes / font-backend

diff --git a/admin/notes/font-backend b/admin/notes/font-backend
index f787915c1aa16e634459c09896f5a0ca83dc1c26..ec2dc11345b8783409360f0f55f232d82e5e9395 100644 (file)
--- a/admin/notes/font-backend
+++ b/admin/notes/font-backend
@@ -1,16 +1,10 @@
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
-  Free Software Foundation, Inc.
+Copyright (C) 2002-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
 New font handling mechanism with font backend method
 ----------------------------------------------------
 
-The configure script, if invoked with "--enable-font-backend", checks
-if libraries freetype and fontconfig exist.  If they are both
-available, macro "USE_FONT_BACKEND" is defined in src/config.h.  In
-that case, the existence of Xft library is checked too.
-
 The new files are:
        font.h -- header providing font-backend related structures
                (most important ones are "struct font" and "struct
@@ -44,10 +38,6 @@ Fontconfig are also available on w32, what we need may be:
        ftw32font.c -- font-driver on w32 directly using FreeType fonts
                utilizing methods provided by ftfont.c.
 
-And, for those to work, macterm.c and macfns.c must be changed by the
-similar way as xterm.c and xfns.c (the parts "#ifdef USE_FONT_BACKEND"
-... "#endif" should be checked).
-
 It may be interesting if Emacs supports a frame buffer directly and
 has these font driver.
        ftfbfont.c -- font-driver on FB for FreeType fonts.
@@ -65,10 +55,10 @@ In such a case, please try this:
 \f
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -76,6 +66,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.