diff options
| author | Mathias Gumz <akira@fluxbox.org> | 2017-11-19 19:01:53 (GMT) |
|---|---|---|
| committer | Mathias Gumz <akira@fluxbox.org> | 2017-11-19 19:03:06 (GMT) |
| commit | 0090dc8a6ba4b5c360ecda470b316e630b85c30c (patch) | |
| tree | dcaaf5319586cf84cc2f3bf748d8465380746f45 | |
| parent | 5adf31002f35b4582f17e2a498f6c152994c26ac (diff) | |
| parent | 5a9791e3589a9ee0d428c29c9ba9a0dae69a86a1 (diff) | |
| download | fluxbox-0090dc8a6ba4b5c360ecda470b316e630b85c30c.zip fluxbox-0090dc8a6ba4b5c360ecda470b316e630b85c30c.tar.bz2 | |
Merge documentation
| -rw-r--r-- | doc/asciidoc/fluxbox-style.txt | 3 | ||||
| -rw-r--r-- | doc/fluxbox-style.5.in | 3 |
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> | |||
| 268 | window\&.close\&.pixmap: <filename> | 268 | window\&.close\&.pixmap: <filename> |
| 269 | window\&.close\&.pressed\&.pixmap: <filename> | 269 | window\&.close\&.pressed\&.pixmap: <filename> |
| 270 | window\&.close\&.unfocus\&.pixmap: <filename> | 270 | window\&.close\&.unfocus\&.pixmap: <filename> |
| 271 | window\&.font: <font> | ||
| 272 | window\&.frame\&.focusColor: <color> | 271 | window\&.frame\&.focusColor: <color> |
| 273 | window\&.frame\&.unfocusColor: <color> | 272 | window\&.frame\&.unfocusColor: <color> |
| 274 | window\&.grip\&.focus: <texture type> | 273 | window\&.grip\&.focus: <texture type> |
| @@ -297,10 +296,12 @@ window\&.label\&.active\&.textColor: <color> | |||
| 297 | window\&.label\&.focus: <texture type> | 296 | window\&.label\&.focus: <texture type> |
| 298 | window\&.label\&.focus\&.color: <color> | 297 | window\&.label\&.focus\&.color: <color> |
| 299 | window\&.label\&.focus\&.colorTo: <color> | 298 | window\&.label\&.focus\&.colorTo: <color> |
| 299 | window\&.label\&.focus\&.font: <font> | ||
| 300 | window\&.label\&.focus\&.pixmap: <filename> | 300 | window\&.label\&.focus\&.pixmap: <filename> |
| 301 | window\&.label\&.unfocus: <texture type> | 301 | window\&.label\&.unfocus: <texture type> |
| 302 | window\&.label\&.unfocus\&.color: <color> | 302 | window\&.label\&.unfocus\&.color: <color> |
| 303 | window\&.label\&.unfocus\&.colorTo: <color> | 303 | window\&.label\&.unfocus\&.colorTo: <color> |
| 304 | window\&.label\&.unfocus\&.font: <font> | ||
| 304 | window\&.label\&.unfocus\&.pixmap: <filename> | 305 | window\&.label\&.unfocus\&.pixmap: <filename> |
| 305 | window\&.label\&.focus\&.textColor: <color> | 306 | window\&.label\&.focus\&.textColor: <color> |
| 306 | window\&.label\&.unfocus\&.textColor: <color> | 307 | window\&.label\&.unfocus\&.textColor: <color> |