diff --git a/doc/app_debug_win.php b/doc/app_debug_win.php
index 466f262d32..ad4132912d 100644
--- a/doc/app_debug_win.php
+++ b/doc/app_debug_win.php
@@ -33,10 +33,7 @@ echo "
This section is going to describe what the output of a crash dump looks like and what it contains.
-
-
-
-
+"; block_start(); echo "
BOINC Windows Runtime Debugger Version 5.5.0
Dump Timestamp : 04/16/06 23:41:39
@@ -45,10 +42,7 @@ Symbol Search Path: C:\\BOINCSRC\\Main\\boinc_samples\\win_build\\Release;
C:\\BOINCSRC\\Main\\boinc_samples\\win_build\\Release;
srv*c:\\windows\\symbols*http://msdl.microsoft.com/download/symbols;
srv*C:\\DOCUME~1\\romw\\LOCALS~1\\Temp\\symbols*http://boinc.berkeley.edu/symstore
-
- |
-
-
+"; block_end(); echo "
This area provides some basic information about the version of the BOINC debugger
being used, when the crash occured, and what the internal version of the Windows
diff --git a/doc/bugs.php b/doc/bugs.php
index 0c50e37ea6..400e545939 100644
--- a/doc/bugs.php
+++ b/doc/bugs.php
@@ -27,4 +27,5 @@ and is readable by the rest of the world.
";
}
+page_tail();
?>
diff --git a/doc/dialup.php b/doc/dialup.php
new file mode 100644
index 0000000000..5b6af59732
--- /dev/null
+++ b/doc/dialup.php
@@ -0,0 +1,89 @@
+
+If you run BOINC on a computer with an Internet
+connection that's not always on
+(such as a modem, ISDN or VPN connection),
+you can have BOINC connect in either of two ways:
+
+
+- Automatic:
+BOINC establishes an Internet connection as needed,
+with no action on your part.
+It optionally closes the connection when done.
+This mode is useful
+with dedicated modem lines, ISDN and VPN connections.
+It is also be useful in combination with
+general preferences that set a time range when
+BOINC is allowed to communicate (such as at night wnen
+the phone line won't be in use or phone rates are cheaper).
+
- Manual:
+BOINC notifies you when it needs to connect to the Internet.
+This mode is useful when a phone line is used for both
+modem and regular phone calls.
+It eliminates the situation where BOINC starts dialing
+in the middle of a conversation.
+
+
+Automatic connection
+
+Note: this mode is currently available only on Windows.
+To use automatic connection:
+
+ - Select a default connection using the BOINC Manager
+
+ - Click the 'Advanced' menu and click 'Options'.
+
- Select the 'Connections' tab
+
- Select the connection to be used by BOINC
+
- Click the 'Set default' checkbox
+
- Click the 'OK' button
+
+ - Set network preferences on project web site
+
+ - Set 'Confirm before connecting to Internet' to 'No'.
+
- Set 'Disconnect when done' to 'Yes'.
+
- Set 'Use network only between the hours of' as required
+
- Click 'Update preferences' button at the bottom of the page
+
- In BOINC Manager, 'update' the project to download the new
+ preferences.
+
+
+
+Manual connection
+
+In this mode, BOINC gets your permission before connection.
+This mode is in effect if you haven't selected a default connection,
+or if your 'confirm before connection' preference is set to Yes.
+
+When BOINC Manager is minimized to the system tray (no open window),
+and BOINC needs to communicate,
+a little yellow balloon will pop up
+with a message about BOINC needing a connection to the Internet.
+You must open BOINC Manager to continue; to do so, double-click the BOINC icon.
+
+
Default connection
+
+This mode is currently available only on Windows.
+If you've selected a default connection (see above)
+and your 'confirm before connection' preference is set to Yes,
+then when BOINC needs to communicate you'll see a Confirm Yes/No dialog.
+Click Yes to connect.
+BOINC will use your default connection.
+You may need to type in a user name and password depending
+on how this connection is configured.
+
+
No default connection
+
+If you don't have a default connection and BOINC needs to communicate,
+the BOINC Manager will open a dialog asking you
+to open an Internet connection.
+You can then open a connection by whatever method you normally use,
+and click OK in the dialog when you're done.
+
+
+";
+page_tail();
+?>
diff --git a/doc/docutil.php b/doc/docutil.php
index 7a59c133df..dcf332e95e 100644
--- a/doc/docutil.php
+++ b/doc/docutil.php
@@ -143,4 +143,19 @@ function error_page($x) {
exit();
}
+function block_start() {
+ global $light_blue;
+ echo "
+
+
+
+ ";
+}
+
+function block_end() {
+ echo " |
+ ";
+
+}
+
?>
diff --git a/doc/energy.php b/doc/energy.php
new file mode 100644
index 0000000000..6a60902592
--- /dev/null
+++ b/doc/energy.php
@@ -0,0 +1,72 @@
+The energy cost and environmental impact of running BOINC
+
+A computer running BOINC uses more energy than an idle computer.
+The amount of additional energy depends on several factors:
+
+- How many additional hours per day you
+ you leave your computer powered on to run BOINC.
+
- The energy consumption of your computer.
+
- Whether you use your computer's power-management features
+to turn off your monitor when idle.
+
- Your marginal electricity cost.
+
+Using some typical values for energy usage and cost,
+here are estimates of the monthly costs:
+";
+list_start();
+list_heading_array(array(
+ "Computer state
(24 hrs/day)",
+ "Typical power usage",
+ "Energy per month",
+ "Cost per month
assuming USA average of 8 cents/kWh;
+
the cost in Europe is about 50% higher."
+ ));
+list_item_array(array("Off", "0 watts", "0 kWh", "$0"));
+list_item_array(array("Idle", "100 watts", "73 kWh", "$5.84"));
+list_item_array(array("Active", "150 watts", "110 kWh", "$8.80"));
+list_end();
+echo "
+Under these assumptions, running BOINC costs about $3/month
+relative to leaving your computer on but idle,
+and about $8.80/month relative to leaving it off all the time.
+
+
+There may also be an environmental cost.
+If your electricity is produced by burning fossil fuels,
+the extra electricity usage produces greenhouse gases
+that contribute to global warming.
+If this is the case, we recommend that you
+not leave your computer on just to run BOINC,
+or that you reduce your overall energy use to compensate.
+
+
+You can measure the power usage of their computer using
+a power consumption meter.
+These are available for
+American
+UK-type
+electrical outlets.
+
+
How reduce BOINC's energy usage and cost
+Some possibilities:
+
+-
+Set your general preferences to allow BOINC
+to compute while your computer is in use,
+and turn your computer off when it's not in use.
+
- Use your computer's power-management features to
+turn off your monitor when it's not in use,
+or to enter a low-power mode.
+A
+technical document about computer power management
+is available from Lawrence Berkeley Laboratories.
+
- If your electricity costs vary according to time of day,
+set your general preferences
+so that BOINC computes only during periods of low electricity costs.
+";
+page_tail();
+?>
diff --git a/doc/gui_urls.php b/doc/gui_urls.php
index 1b884d8d0e..e602ee605e 100644
--- a/doc/gui_urls.php
+++ b/doc/gui_urls.php
@@ -45,7 +45,7 @@ they will be sent only if the user belongs to a team.
The components of a
<gui_url>
element are:
";
list_start();
-list_item("name", "A short name, used e.g. as a menu item");
+list_item("name", "A short name, used e.g. as a button name or menu item");
list_item("description", "An explanation, used e.g. as a rollover popup");
list_item("url", "The URL");
list_end();
diff --git a/doc/index.php b/doc/index.php
index 89d8919363..f1fa3aefea 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -123,8 +123,6 @@ but also works well for desktop grid computing within organizations.
";
search_form();
echo "
-
-
diff --git a/doc/prefs_override.php b/doc/prefs_override.php
new file mode 100644
index 0000000000..d16161fdf1
--- /dev/null
+++ b/doc/prefs_override.php
@@ -0,0 +1,47 @@
+global preferences
+are maintained on a project server,
+edited via a web interface, and downloaded from the server.
+
+
+Some people may want to edit preferences locally,
+or modify preferences on a single host.
+To accommodate these requirements, BOINC lets you
+create a 'preferences override file'.
+This file is read by the core client after
+it reads the preferences from the server,
+and it overrides those preferences.
+
+The preferences override file is named global_prefs_override.xml
.
+Its structure as follows:
+".html_text("
+
+ 0
+ 3
+ 60
+ 0.1
+ 2
+ 60
+ 100
+ 50
+ 0.1
+ 75
+ 0
+ 0
+
+")."
+
+
+If you write a program for editing preferences locally,
+you'll want to be able to tell a running core client to
+reread the preferences override file.
+You can do this using the
+read_global_prefs_override() GUI RPC.
+Or you can stop and start the core client.
+";
+page_tail();
+?>