From 0795334dd80c109c7d540a448319e5f8308b1cd8 Mon Sep 17 00:00:00 2001
From: marco candrian <mac@calmar.ws>
Date: Sat, 15 Mar 2008 16:10:46 +0100
Subject: [PATCH] Font removed where style should be used now

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 awesomerc.5.txt     | 10 ++--------
 common/configopts.c |  3 ---
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/awesomerc.5.txt b/awesomerc.5.txt
index 5d93364e..e3f123a3 100644
--- a/awesomerc.5.txt
+++ b/awesomerc.5.txt
@@ -48,8 +48,6 @@ titlebar::
     This section defines the parameters of the windows titlebar.
 border::
     This defines the window borders size in pixel.
-font::
-    This defines the general font used in awesome.
 new_become_master::
     If this is set to true, new windows will become the master window.
 new_get_focus::
@@ -407,12 +405,10 @@ This widget shows a text.
 
 *mouse*::
     Set mouse bindings.
-*font*::
-    Font to use.
 *width*::
     Set width.
-*styles*::
-    Styles section with a focus and normal subsection.
+*style*::
+    Style section with <style section>
 *text*::
     Text to change.
 *text_align*::
@@ -555,7 +551,6 @@ screen <integer> [MULTI]
     general
     {
         border = <integer>
-        font = <font>
         new_become_master = <boolean>
         new_get_focus = <boolean>
         opacity_unfocused = <integer>
@@ -644,7 +639,6 @@ screen <integer> [MULTI]
                 normal { <style section> }
                 focus { <style section> }
             }
-            font = <font>
             show_icons = <boolean>
             show = <{all,tags,focus}>
             text_align = <{center,left,right}>
diff --git a/common/configopts.c b/common/configopts.c
index 5a49c2d3..a1ac2058 100644
--- a/common/configopts.c
+++ b/common/configopts.c
@@ -155,7 +155,6 @@ cfg_opt_t widget_textbox_opts[] =
     CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI),
     CFG_INT((char *) "width", 0, CFGF_NONE),
     CFG_STR((char *) "text", (char *) NULL, CFGF_NONE),
-    CFG_STR((char *) "font", (char *) NULL, CFGF_NONE),
     CFG_STR((char *) "text_align", (char *) "center", CFGF_NONE),
     CFG_SEC((char *) "style", style_opts, CFGF_NONE),
     CFG_AWESOME_END()
@@ -166,7 +165,6 @@ cfg_opt_t widget_tasklist_opts[] =
     CFG_INT((char *) "y", 0xffffffff, CFGF_NONE),
     CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI),
     CFG_SEC((char *) "styles", styles_opts, CFGF_NONE),
-    CFG_STR((char *) "font", (char *) NULL, CFGF_NONE),
     CFG_STR((char *) "text_align", (char *) "left", CFGF_NONE),
     CFG_STR((char *) "show", (char *) "tags", CFGF_NONE),
     CFG_BOOL((char *) "show_icons", cfg_true, CFGF_NONE),
@@ -331,7 +329,6 @@ cfg_opt_t menu_opts[] =
     CFG_INT((char *) "height", 0, CFGF_NONE),
     CFG_INT((char *) "y", 0xffffffff, CFGF_NONE),
     CFG_INT((char *) "x", 0xffffffff, CFGF_NONE),
-    CFG_STR((char *) "font", NULL, CFGF_NONE),
     CFG_SEC((char *) "styles", styles_opts, CFGF_NONE),
     CFG_AWESOME_END()
 };