aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira@fluxbox.org>2017-11-19 19:01:53 (GMT)
committerMathias Gumz <akira@fluxbox.org>2017-11-19 19:03:06 (GMT)
commit0090dc8a6ba4b5c360ecda470b316e630b85c30c (patch)
treedcaaf5319586cf84cc2f3bf748d8465380746f45
parent5adf31002f35b4582f17e2a498f6c152994c26ac (diff)
parent5a9791e3589a9ee0d428c29c9ba9a0dae69a86a1 (diff)
downloadfluxbox-0090dc8a6ba4b5c360ecda470b316e630b85c30c.zip
fluxbox-0090dc8a6ba4b5c360ecda470b316e630b85c30c.tar.bz2
Merge documentation
-rw-r--r--doc/asciidoc/fluxbox-style.txt3
-rw-r--r--doc/fluxbox-style.5.in3
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/asciidoc/fluxbox-style.txt b/doc/asciidoc/fluxbox-style.txt
index dea8794..6741f41 100644
--- a/doc/asciidoc/fluxbox-style.txt
+++ b/doc/asciidoc/fluxbox-style.txt
@@ -248,7 +248,6 @@ options. Have fun.
248 window.close.pixmap: <filename> 248 window.close.pixmap: <filename>
249 window.close.pressed.pixmap: <filename> 249 window.close.pressed.pixmap: <filename>
250 window.close.unfocus.pixmap: <filename> 250 window.close.unfocus.pixmap: <filename>
251 window.font: <font>
252 window.frame.focusColor: <color> 251 window.frame.focusColor: <color>
253 window.frame.unfocusColor: <color> 252 window.frame.unfocusColor: <color>
254 window.grip.focus: <texture type> 253 window.grip.focus: <texture type>
@@ -277,10 +276,12 @@ options. Have fun.
277 window.label.focus: <texture type> 276 window.label.focus: <texture type>
278 window.label.focus.color: <color> 277 window.label.focus.color: <color>
279 window.label.focus.colorTo: <color> 278 window.label.focus.colorTo: <color>
279 window.label.focus.font: <font>
280 window.label.focus.pixmap: <filename> 280 window.label.focus.pixmap: <filename>
281 window.label.unfocus: <texture type> 281 window.label.unfocus: <texture type>
282 window.label.unfocus.color: <color> 282 window.label.unfocus.color: <color>
283 window.label.unfocus.colorTo: <color> 283 window.label.unfocus.colorTo: <color>
284 window.label.unfocus.font: <font>
284 window.label.unfocus.pixmap: <filename> 285 window.label.unfocus.pixmap: <filename>
285 window.label.focus.textColor: <color> 286 window.label.focus.textColor: <color>
286 window.label.unfocus.textColor: <color> 287 window.label.unfocus.textColor: <color>
diff --git a/doc/fluxbox-style.5.in b/doc/fluxbox-style.5.in
index 12914a3..f4b7790 100644
--- a/doc/fluxbox-style.5.in
+++ b/doc/fluxbox-style.5.in
@@ -268,7 +268,6 @@ window\&.button\&.unfocus\&.pixmap: <filename>
268window\&.close\&.pixmap: <filename> 268window\&.close\&.pixmap: <filename>
269window\&.close\&.pressed\&.pixmap: <filename> 269window\&.close\&.pressed\&.pixmap: <filename>
270window\&.close\&.unfocus\&.pixmap: <filename> 270window\&.close\&.unfocus\&.pixmap: <filename>
271window\&.font: <font>
272window\&.frame\&.focusColor: <color> 271window\&.frame\&.focusColor: <color>
273window\&.frame\&.unfocusColor: <color> 272window\&.frame\&.unfocusColor: <color>
274window\&.grip\&.focus: <texture type> 273window\&.grip\&.focus: <texture type>
@@ -297,10 +296,12 @@ window\&.label\&.active\&.textColor: <color>
297window\&.label\&.focus: <texture type> 296window\&.label\&.focus: <texture type>
298window\&.label\&.focus\&.color: <color> 297window\&.label\&.focus\&.color: <color>
299window\&.label\&.focus\&.colorTo: <color> 298window\&.label\&.focus\&.colorTo: <color>
299window\&.label\&.focus\&.font: <font>
300window\&.label\&.focus\&.pixmap: <filename> 300window\&.label\&.focus\&.pixmap: <filename>
301window\&.label\&.unfocus: <texture type> 301window\&.label\&.unfocus: <texture type>
302window\&.label\&.unfocus\&.color: <color> 302window\&.label\&.unfocus\&.color: <color>
303window\&.label\&.unfocus\&.colorTo: <color> 303window\&.label\&.unfocus\&.colorTo: <color>
304window\&.label\&.unfocus\&.font: <font>
304window\&.label\&.unfocus\&.pixmap: <filename> 305window\&.label\&.unfocus\&.pixmap: <filename>
305window\&.label\&.focus\&.textColor: <color> 306window\&.label\&.focus\&.textColor: <color>
306window\&.label\&.unfocus\&.textColor: <color> 307window\&.label\&.unfocus\&.textColor: <color>