From c5c26547cd4bcbe4df37c43bab4c00f92e812540 Mon Sep 17 00:00:00 2001 From: Randy McMurchy Date: Mon, 10 Apr 2006 18:39:30 +0000 Subject: [PATCH] Added the 'User Notes' wiki link to each package page; changed all instances of .[so,a] to .{so,a} (brackets changed to braces); changed all replaceable tags to use angle brackets instead of square brackets to encapsulate the text - commit #10 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5838 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- x/installing/x-setup.xml | 4 ++-- x/installing/xorg.xml | 2 +- x/installing/xorg7.xml | 6 +++--- x/lib/atk.xml | 3 +++ x/lib/cairo.xml | 9 ++++++--- x/lib/freeglut.xml | 7 +++++-- x/lib/goffice.xml | 5 ++++- x/lib/gtk+.xml | 13 ++++++++----- x/lib/gtk+2.xml | 5 ++++- x/lib/hicolor-icon-theme.xml | 3 +++ x/lib/lesstif.xml | 3 +++ x/lib/libdrm.xml | 9 ++++++--- x/lib/libwnck.xml | 9 ++++++--- x/lib/libxklavier.xml | 9 ++++++--- x/lib/mesalib.xml | 7 +++++-- x/lib/pango.xml | 3 +++ x/lib/qt.xml | 10 +++++----- x/lib/shared-mime-info.xml | 3 +++ x/lib/startup-notification.xml | 9 ++++++--- x/wm/fluxbox.xml | 5 ++++- x/wm/metacity.xml | 9 ++++++--- x/wm/sawfish.xml | 3 +++ x/wm/xfce.xml | 9 ++++++--- 23 files changed, 101 insertions(+), 44 deletions(-) diff --git a/x/installing/x-setup.xml b/x/installing/x-setup.xml index 2bd576d776..3d20aff62a 100644 --- a/x/installing/x-setup.xml +++ b/x/installing/x-setup.xml @@ -144,9 +144,9 @@ EndSection replacing the "iso8859-1" string with the proper encoding name. This is accomplished by running the following command as the root user, substituting the proper value - for [X]: + for <X>: -sed -i 's,iso8859-1\( \|$\),iso8859-[X]\1,g' \ +sed -i 's,iso8859-1\( \|$\),iso8859-<X>\1,g' \ /usr/lib/X11/fonts/{75dpi,100dpi,misc}/fonts.alias Users of Cyrillic fonts have properly defined aliases in diff --git a/x/installing/xorg.xml b/x/installing/xorg.xml index 49ef47f5c5..0d5b393eaa 100644 --- a/x/installing/xorg.xml +++ b/x/installing/xorg.xml @@ -215,7 +215,7 @@ sed -i "s@*/@*/\n#include <linux/types.h>\n@" \ needs another correction to fix a hard coded path. Execute the following command: -sed -i 's@/usr/X11R6@[/usr]@' programs/luit/parser.h +sed -i 's@/usr/X11R6@</usr>@' programs/luit/parser.h diff --git a/x/installing/xorg7.xml b/x/installing/xorg7.xml index daa261d8e1..74bd8dd194 100644 --- a/x/installing/xorg7.xml +++ b/x/installing/xorg7.xml @@ -143,7 +143,7 @@ cd xc XORG_PREFIX variable with the following command: -export XORG_PREFIX="[/usr]" +export XORG_PREFIX="</usr>" Throughout these instructions, you will use the same three configure switches for all of the packages. Create the @@ -153,7 +153,7 @@ cd xc If you've decided to use an alternate prefix, be sure to add - [/usr]/lib/pkgconfig + </usr>/lib/pkgconfig to your PKG_CONFIG_PATH variable. @@ -535,7 +535,7 @@ ln -svn $XORG_PREFIX/lib/X11/fonts/TTF /usr/share/fonts/X11-TTFInstall the server by running the following commands: ./configure $XORG_CONFIG \ - --with-mesa-source='[/path/to]/Mesa-&mesalib-version;' \ + --with-mesa-source='</path/to>/Mesa-&mesalib-version;' \ --with-fontdir=$XORG_PREFIX/lib/X11/fonts \ --with-module-dir=$XORG_PREFIX/lib/X11/modules && make diff --git a/x/lib/atk.xml b/x/lib/atk.xml index 4379510057..578636ff92 100644 --- a/x/lib/atk.xml +++ b/x/lib/atk.xml @@ -68,6 +68,9 @@ Optional + User Notes: + + diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml index a4f1259c36..234620d7c3 100644 --- a/x/lib/cairo.xml +++ b/x/lib/cairo.xml @@ -81,6 +81,9 @@ XCB, and + User Notes: + + @@ -133,7 +136,7 @@ make None - libcairo.[so,a] + libcairo.{so,a} /usr/include/cairo and /usr/share/gtk-doc/html/cairo @@ -144,12 +147,12 @@ make - libcairo.[so,a] + libcairo.{so,a} contains the 2D graphics functions required for rendering to the various output targets. - libcairo.[so,a] + libcairo.{so,a} diff --git a/x/lib/freeglut.xml b/x/lib/freeglut.xml index 3325bb808a..5a96a923e5 100644 --- a/x/lib/freeglut.xml +++ b/x/lib/freeglut.xml @@ -66,6 +66,9 @@ Required + User Notes: + + @@ -109,12 +112,12 @@ install -v -m644 doc/freeglut_user_interface.html \ - libglut.[so,a] + libglut.{so,a} contains functions that implement the OpenGL Utility Toolkit. - libglut.[so,a] + libglut.{so,a} diff --git a/x/lib/goffice.xml b/x/lib/goffice.xml index e530b605ec..8e0538af4e 100644 --- a/x/lib/goffice.xml +++ b/x/lib/goffice.xml @@ -89,6 +89,9 @@ to support GNOME by creating the libgsf-gnome-1 library) + User Notes: + + @@ -121,7 +124,7 @@ make libgoffice-1.so and numerous support plugins /usr/include/libgoffice-1, /usr/lib/goffice, - /usr/share/[,pixmaps/]goffice + /usr/share/{,pixmaps/}goffice diff --git a/x/lib/gtk+.xml b/x/lib/gtk+.xml index c770411412..16d69c5dca 100644 --- a/x/lib/gtk+.xml +++ b/x/lib/gtk+.xml @@ -66,6 +66,9 @@ , and + User Notes: + + @@ -110,7 +113,7 @@ install -v -m644 docs/text/* /usr/share/doc/gtk+->K-version;/text< gtk-config - libgdk.[so,a] and libgtk.[so,a] + libgdk.{so,a} and libgtk.{so,a} /etc/gtk, /usr/include/gtk-1.2, and /usr/share/themes @@ -134,25 +137,25 @@ install -v -m644 docs/text/* /usr/share/doc/gtk+->K-version;/text< - libgtk.[so,a] + libgtk.{so,a} (GIMP Tool Kit) is a library for creating graphical user interfaces similar to the Motif look and feel. - libgtk.[so,a] + libgtk.{so,a} - libgdk.[so,a] + libgdk.{so,a} is designed as a wrapper library that lies on top of Xlib. It performs many common and desired operations for a programmer instead of the programmer having to explicitly ask for such functionality from Xlib directly. - libgdk.[so,a] + libgdk.{so,a} diff --git a/x/lib/gtk+2.xml b/x/lib/gtk+2.xml index d63f764171..38023b06b6 100644 --- a/x/lib/gtk+2.xml +++ b/x/lib/gtk+2.xml @@ -80,6 +80,9 @@ and + User Notes: + + @@ -136,7 +139,7 @@ cp -v -R docs/tutorial/html/* /usr/share/doc/gtk+->k2-version;/tutorial /etc/gtk-2.0, /usr/include/gtk-2.0, /usr/lib/gtk-2.0, /usr/share/doc/gtk+->k2-version;, /usr/share/gtk-2.0, - /usr/share/gtk-doc/html/[gdk,gdk-pixbuf,gtk], + /usr/share/gtk-doc/html/{gdk,gdk-pixbuf,gtk}, /usr/share/themes/Default/gtk*, /usr/share/themes/Emacs and /usr/share/themes/Raleigh diff --git a/x/lib/hicolor-icon-theme.xml b/x/lib/hicolor-icon-theme.xml index 7605c03fa7..8148c65605 100644 --- a/x/lib/hicolor-icon-theme.xml +++ b/x/lib/hicolor-icon-theme.xml @@ -60,6 +60,9 @@ xreflabel="hicolor-icon-theme-&hicolor-icon-theme-version;"> + User Notes: + + diff --git a/x/lib/lesstif.xml b/x/lib/lesstif.xml index 50e46382f5..4bf701fea1 100644 --- a/x/lib/lesstif.xml +++ b/x/lib/lesstif.xml @@ -76,6 +76,9 @@ (used to generate the INSTALL documentation file) and Dmalloc + User Notes: + + diff --git a/x/lib/libdrm.xml b/x/lib/libdrm.xml index fa70bfeb6f..7fb71977ec 100644 --- a/x/lib/libdrm.xml +++ b/x/lib/libdrm.xml @@ -59,6 +59,9 @@ + User Notes: + + @@ -91,7 +94,7 @@ make Installed Libraries - libdrm.[so,a] + libdrm.{so,a} @@ -101,11 +104,11 @@ make - libdrm.[so,a] + libdrm.{so,a} contains the Direct Rendering Module library functions. - libdrm.[so,a] + libdrm.{so,a} diff --git a/x/lib/libwnck.xml b/x/lib/libwnck.xml index a9603728f5..b9979326b3 100644 --- a/x/lib/libwnck.xml +++ b/x/lib/libwnck.xml @@ -68,6 +68,9 @@ and + User Notes: + + @@ -97,7 +100,7 @@ make None - libwnck-1.[so,a] + libwnck-1.{so,a} /usr/include/libwnck-1.0 and /usr/share/gtk-doc/html/libwnck @@ -109,11 +112,11 @@ make - libwnck-1.[so,a] + libwnck-1.{so,a} contains functions for writing pagers and task lists. - libwnck-1.[so,a] + libwnck-1.{so,a} diff --git a/x/lib/libxklavier.xml b/x/lib/libxklavier.xml index 23220c0026..848f4024a4 100644 --- a/x/lib/libxklavier.xml +++ b/x/lib/libxklavier.xml @@ -68,6 +68,9 @@ Optional + User Notes: + + @@ -95,7 +98,7 @@ make None - libxklavier.[so,a] + libxklavier.{so,a} /usr/include/libxklavier, and /usr/share/libxklavier @@ -106,11 +109,11 @@ make - libxklavier.[so,a] + libxklavier.{so,a} contains XKB utility functions. - libxklavier.[so,a] + libxklavier.{so,a} diff --git a/x/lib/mesalib.xml b/x/lib/mesalib.xml index 9c2d897ca0..7f4c0eebcf 100644 --- a/x/lib/mesalib.xml +++ b/x/lib/mesalib.xml @@ -85,6 +85,9 @@ directory. + User Notes: + + @@ -135,7 +138,7 @@ make PROGS='glxinfo glxgears' Execute the following command as the root user: -ln -s -v [/usr/X11]/include/GL /usr/include +ln -s -v </usr/X11>/include/GL /usr/include @@ -178,7 +181,7 @@ make PROGS='glxinfo glxgears' glxgears and glxinfo - libGL.[so,a], libGLU.[so,a], libGLw.[so,a], libglut.[so,a] and + libGL.{so,a}, libGLU.{so,a}, libGLw.{so,a}, libglut.{so,a} and *_dri.so $XORG_PREFIX/lib/modules/dri diff --git a/x/lib/pango.xml b/x/lib/pango.xml index 5f83c39be7..84e0fdc4fd 100644 --- a/x/lib/pango.xml +++ b/x/lib/pango.xml @@ -80,6 +80,9 @@ Optional (To Rebuild the API Documentation) + User Notes: + + diff --git a/x/lib/qt.xml b/x/lib/qt.xml index 94e400375e..476534b29c 100644 --- a/x/lib/qt.xml +++ b/x/lib/qt.xml @@ -75,8 +75,8 @@ Note: if for whatever reason you do not have the recommended libraries installed on your system, you must remove the corresponding - -system-[library] and - -plugin-imgfmt-[library] + -system-<library> and + -plugin-imgfmt-<library> parameters from the configure commands shown in the instructions below. @@ -252,9 +252,9 @@ cp -v -r examples /opt/qt/doc If you pass the - + switch to the configure command, you must also pass - + so make can find the appropriate header files. @@ -366,7 +366,7 @@ ldconfig && cat >> /etc/man_db.conf << "EOF" # Begin qt addition to man_db.conf -MANPATH /opt/qt/doc/man +MANDATORY_MANPATH /opt/qt/doc/man # End qt addition to man_db.conf EOF diff --git a/x/lib/shared-mime-info.xml b/x/lib/shared-mime-info.xml index 517b519c08..54b7c72777 100644 --- a/x/lib/shared-mime-info.xml +++ b/x/lib/shared-mime-info.xml @@ -67,6 +67,9 @@ xreflabel="shared-mime-info-&shared-mime-info-version;"> , and + User Notes: + + diff --git a/x/lib/startup-notification.xml b/x/lib/startup-notification.xml index 155d637d3a..3ea7b328b2 100644 --- a/x/lib/startup-notification.xml +++ b/x/lib/startup-notification.xml @@ -66,6 +66,9 @@ xreflabel="startup-notification-&startup-notification-version;"> Required + User Notes: + + @@ -95,7 +98,7 @@ install -v -m644 -D doc/startup-notification.txt \ None - libstartup-notification-1.[so,a] + libstartup-notification-1.{so,a} /usr/include/startup-notification-1.0 and /usr/share/doc/startup-notification-&startup-notification-version; @@ -107,13 +110,13 @@ install -v -m644 -D doc/startup-notification.txt \ - libstartup-notification-1.[so,a] + libstartup-notification-1.{so,a} provides the functions to assist applications in communicating with the cursor system to provide feedback to the user that the application is loading. - libstartup-notification-1.[so,a] + libstartup-notification-1.{so,a} diff --git a/x/wm/fluxbox.xml b/x/wm/fluxbox.xml index 84af051dbd..ae165d492e 100644 --- a/x/wm/fluxbox.xml +++ b/x/wm/fluxbox.xml @@ -66,6 +66,9 @@ Optional Image display library + User Notes: + + @@ -171,7 +174,7 @@ fluxbox-generate_menu If you want to use an image as your desktop background, copy the theme you like into ~/.fluxbox. Then add a line to make it use the correct image. In the following command, - change [theme] for the name of the theme you + change <theme> for the name of the theme you want and change /path/to/nice/image.xpm to reflect the actual image you want to use. diff --git a/x/wm/metacity.xml b/x/wm/metacity.xml index b5385a452b..07ea674d8d 100644 --- a/x/wm/metacity.xml +++ b/x/wm/metacity.xml @@ -77,6 +77,9 @@ must enable explicitly to get it. And it doesn't work, so don't bother unless you want to hack on it... + User Notes: + + @@ -159,14 +162,14 @@ EOF metacity, metacity-message, metacity-theme-viewer and metacity-window-demo - libmetacity-private.[so,a] - &gnome-etc-dir;/gconf/gconf.xml.defaults[,/schemas]/apps/metacity, + libmetacity-private.{so,a} + &gnome-etc-dir;/gconf/gconf.xml.defaults{,/schemas}/apps/metacity, /usr/include/metacity-1, /usr/lib/metacity, /usr/share/doc/metacity-&metacity-version;, /usr/share/gnome/wm-properties, /usr/share/metacity and - /usr/share/themes/[AgingGorilla,Atlanta,Bright,Crux,Esco,Metabox,Simple]/metacity-1 + /usr/share/themes/{AgingGorilla,Atlanta,Bright,Crux,Esco,Metabox,Simple}/metacity-1 diff --git a/x/wm/sawfish.xml b/x/wm/sawfish.xml index 81cc51cc6e..3ca2b7317b 100644 --- a/x/wm/sawfish.xml +++ b/x/wm/sawfish.xml @@ -66,6 +66,9 @@ and + User Notes: + + diff --git a/x/wm/xfce.xml b/x/wm/xfce.xml index 472c2e5b0a..4a379800c1 100644 --- a/x/wm/xfce.xml +++ b/x/wm/xfce.xml @@ -71,6 +71,9 @@ and (required to build xfprint). + User Notes: + + @@ -256,10 +259,10 @@ EOF xflock4, xfmime-edit, xfmountdev4, xfrecent, xfrecent4, xfprint-manager, xfprint4, xfrun4, xfsamba4, xftaskbar4, xfterm4, xftrash4, xftree4, and xfwm4 - libxfce4util.[a,so], libdbh.[a,so], libxfcegui4.[a,so], - libxfce4mcs.[a,so], libxffm_actions.so, libxffm_basic.so, libxffm_calls.so, + libxfce4util.{a,so}, libdbh.{a,so}, libxfcegui4.{a,so}, + libxfce4mcs.{a,so}, libxffm_actions.so, libxffm_basic.so, libxffm_calls.so, libxffm_cpy.so, libxffm_on_demand.so, libxffm_secondary.so, libxffm_tubo.so, - libxfsm-4.2.[a,so] + libxfsm-4.2.{a,so} /usr/lib/xfce4, /usr/share/doc/xfce4, /usr/share/xfce4, /usr/share/xffm and /usr/share/xfwm4