From a3bb5005c9346a5d7595a15770b4a6dabc790047 Mon Sep 17 00:00:00 2001 From: jervfors Date: Thu, 8 Mar 2007 12:13:09 +0000 Subject: [PATCH] Removing "www." in some links as well as the link to the deprecated feedback page. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12325 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- INSTALL | 10 +++++----- README | 9 ++------- ReleaseNotes | 4 ++-- config/conf.pl | 5 ++--- contrib/RPM/squirrelmail.spec | 2 +- contrib/conf.pl.8 | 2 +- help/en_US/FAQ.hlp | 2 +- plugins/bug_report/bug_report.php | 2 +- src/about.php | 3 +-- 9 files changed, 16 insertions(+), 23 deletions(-) diff --git a/INSTALL b/INSTALL index 612eeb98..d6188376 100644 --- a/INSTALL +++ b/INSTALL @@ -28,9 +28,9 @@ Each of these steps is covered in detail below. - Run config/conf.pl from the command line. Use the D option to load predefined options for specific IMAP servers, and edit at least the Server Settings and General Options (datadir). -- Browse to http://www.example.com/yourwebmaillocation/src/configtest.php +- Browse to http://example.com/yourwebmaillocation/src/configtest.php to test your configuration for common errors. -- Browse to http://www.example.com/yourwebmaillocation/ to log in. +- Browse to http://example.com/yourwebmaillocation/ to log in. 1. CONFIGURE YOUR WEBSERVER TO WORK WITH PHP @@ -40,7 +40,7 @@ Each of these steps is covered in detail below. to work with PHP. You need at least PHP v4.1.0. SquirrelMail uses the standard suffix .php for all PHP files. - You can find PHP at http://www.php.net. See the documentation that + You can find PHP at http://php.net. See the documentation that comes with PHP for instructions how to set it up. The PHP IMAP extension is NOT necessary at all (but won't harm)! @@ -91,7 +91,7 @@ Each of these steps is covered in detail below. ---------------------------------------- SquirrelMail is constantly being improved. Therefore you should always - get the newest version around. Look at http://www.squirrelmail.org + get the newest version around. Look at http://squirrelmail.org to see what it is. If you want to be bleeding edge you might want to consider using the latest SVN version (with the latest and most fashionable bugs). @@ -191,7 +191,7 @@ c. Setting up SquirrelMail Point your browser at the URL at which SquirrelMail is installed. A possible example of this is: - http://www.example.com/squirrelmail + http://example.com/squirrelmail It should be pretty straight forward to use. Some more documentation might show up one day or another. diff --git a/README b/README index d278b46a..e9f3c8c9 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ SquirrelMail -http://www.squirrelmail.org +http://squirrelmail.org Introduction: ------------- @@ -29,11 +29,6 @@ emails from people just telling us that they're using SquirrelMail. If you have a few minutes, please send us an email to let us know! You can send it to our mailing list: squirrelmail-users@lists.sourceforge.net -You can also go to the page below and fill out a small form to get listed -with the list of people already using SquirrelMail (free advertising). - - http://www.squirrelmail.org/feedback.php - Contact: -------- It is pretty easy to get in contact with the developers if you need help or @@ -43,7 +38,7 @@ be through our mailing list which is actively monitored. squirrelmail-users@lists.sourceforge.net NOTE: you need to be subscribed to this mailinglist to be able to post to it! -Please visit our web page (http://www.squirrelmail.org) and go to the section +Please visit our web page (http://squirrelmail.org) and go to the section titled "Mailing Lists". Installation: diff --git a/ReleaseNotes b/ReleaseNotes index da517486..9232aecd 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -169,7 +169,7 @@ any bugs you come across! Also, please mention that the bug is in this release (version 1.5.1), and list your IMAP server and web server details. Bugs can be submitted at: - http://www.squirrelmail.org/bugs + http://squirrelmail.org/bugs Thanks for your cooperation with this. This helps ensure that nothing slips through the cracks. Also, please search the bug database for existing items @@ -200,7 +200,7 @@ the 1.4.x series of SquirrelMail. If you find issues in this package, make sure that they are still present in the latest development code snapshots. To obtain thelatest development snapshot, see - http://www.squirrelmail.org/download.php#snapshot + http://squirrelmail.org/download.php#snapshot Happy SquirrelMailing! - The SquirrelMail Project Team diff --git a/config/conf.pl b/config/conf.pl index cb2e22ae..e3044ea1 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -140,7 +140,7 @@ if ( -e "config.php" ) { print " should get the 'config_default.php' that matches the version\n"; print " of SquirrelMail that you are running. You can get this from\n"; print " the SquirrelMail web page by going to the following URL:\n"; - print " http://www.squirrelmail.org.\n"; + print " http://squirrelmail.org.\n"; print "\n"; print "Continue loading with old config_default.php (a bad idea) [y/N]? "; $ctu = ; @@ -1015,7 +1015,7 @@ sub command2 { print " to use the default logo, use ../images/sm_logo.png\n"; print " - To specify a logo defined outside the SquirrelMail source tree\n"; print " use the absolute URL the webserver would use to include the file\n"; - print " e.g. http://www.example.com/images/mylogo.gif or /images/mylogo.jpg\n"; + print " e.g. http://example.com/images/mylogo.gif or /images/mylogo.jpg\n"; print "\n"; print "[$WHT$org_logo$NRM]: $WHT"; $new_org_logo = ; @@ -5388,4 +5388,3 @@ PLUGIN: for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) { } } - diff --git a/contrib/RPM/squirrelmail.spec b/contrib/RPM/squirrelmail.spec index c0697717..05764bef 100644 --- a/contrib/RPM/squirrelmail.spec +++ b/contrib/RPM/squirrelmail.spec @@ -21,7 +21,7 @@ Name: squirrelmail Version: 1.4.0 Release: %{rpm_release} License: GPL -URL: http://www.squirrelmail.org/ +URL: http://squirrelmail.org/ Vendor: squirrelmail.org Group: Applications/Internet Source: %{name}-%{version}.tar.bz2 diff --git a/contrib/conf.pl.8 b/contrib/conf.pl.8 index ef22456a..a44db8e2 100644 --- a/contrib/conf.pl.8 +++ b/contrib/conf.pl.8 @@ -26,7 +26,7 @@ Enable a plugin. Activates the plugin and saves SquirrelMail configuration. Disable a plugin. Deactivates the plugin and saves SquirrelMail configuration. .SH "BUGS" If you find bugs in SquirrelMail configuration utility or this manual, you can -report them in SquirrelMail bug tracker. See \fBhttp://www.squirrelmail.org/bugs\fR +report them in SquirrelMail bug tracker. See \fBhttp://squirrelmail.org/bugs\fR .SH "AUTHOR" Tomas Kuliavas .SH "COPYRIGHT" diff --git a/help/en_US/FAQ.hlp b/help/en_US/FAQ.hlp index f7c698d4..2e8d8ec5 100644 --- a/help/en_US/FAQ.hlp +++ b/help/en_US/FAQ.hlp @@ -45,7 +45,7 @@

A lot of people helped out. To get a list of them, you can visit our - web site www.squirrelmail.org. + web site squirrelmail.org.

diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php index 2e847584..9b24726a 100644 --- a/plugins/bug_report/bug_report.php +++ b/plugins/bug_report/bug_report.php @@ -73,7 +73,7 @@ echo "

\n"; echo '
    '; echo '
  • '; -printf(_("Make sure that you are running the most recent copy of %s. You are currently using version %s."), 'SquirrelMail', $version); +printf(_("Make sure that you are running the most recent copy of %s. You are currently using version %s."), 'SquirrelMail', $version); echo "
    • \n"; echo '
  • '; diff --git a/src/about.php b/src/about.php index 5a121887..108a6ff0 100644 --- a/src/about.php +++ b/src/about.php @@ -55,7 +55,7 @@ echo sprintf(_("SquirrelMail is a feature rich, standards compliant webmail appl echo ' '; // i18n: %s tags are used in order to remove html URL attributes from translation -echo sprintf(_("For more information about SquirrelMail and the SquirrelMail Project Team, see %sthe SquirrelMail website%s."),'',''); +echo sprintf(_("For more information about SquirrelMail and the SquirrelMail Project Team, see %sthe SquirrelMail website%s."),'',''); ?>


    @@ -87,4 +87,3 @@ if ( isset($plugins) && count ($plugins) > 0 ) {

    display('footer.tpl'); -?> -- 2.25.1