Language/formatting/style changes #448

Closed
wants to merge 2 commits into
from

Conversation

Projects
None yet
3 participants

English/spelling/grammar/uniformity Nazi strikes again.

I was going to edit more but that configure file itself took a ridiculously longer time than I thought it would.

DonMusto added some commits Mar 29, 2013

@DonMusto DonMusto Update sources.list
Stylized it, edited the language, added a warning about 3rd-parties, looks cleaner
54d8685
@DonMusto DonMusto Update configure
Tons of updates to the English, wording, comments, etc. No meat for the programmers though. Sorry bout that.

~DM
db406ef
Contributor

Robby- commented Mar 29, 2013

I do wonder why you changed some instances of "and" to "&", while actually "and" looks more appropriate.

Show me where you think so - I very well may agree with you.

Owner

DonMusto commented on configure in db406ef Mar 29, 2013

Post-script: In regard to my addition of "Copyright (C) 2013 InspIRCd.org" -- I am told that this is not the appropriate way to cite copyrights; I will count on another to remedy it in the future.

@Robby- Robby- commented on the diff Mar 29, 2013

configure
@@ -99,9 +100,9 @@ GetOptions (
'help' => sub { showhelp(); },
'update' => sub { update(); },
'clean' => sub { clean(); },
- 'list-extras' => sub { list_extras; exit 0; }, # This, --enable-extras, and --disable-extras are for non-interactive managing.
- 'enable-extras=s@' => \@opt_enableextras, # ^
- 'disable-extras=s@' => \@opt_disableextras, # ^
+ 'list-extras' => sub { list_extras; exit 0; }, # This, --enable-extras, & --disable-extras are for non-interactive managing
@Robby-

Robby- Mar 29, 2013

Contributor

Here

@Robby- Robby- commented on the diff Mar 29, 2013

configure
} else {
print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n";
}
exit;
}
-# Get and Set some important vars..
+# Get & set some important variables..
@Robby-

Robby- Mar 29, 2013

Contributor

Here

@Robby- Robby- commented on the diff Mar 29, 2013

configure
open(CACHE, ".config.cache") or return 0;
while (<CACHE>) {
chomp;
- # Ignore Blank lines, and comments..
+ # ignore blank lines & comments..
@Robby-

Robby- Mar 29, 2013

Contributor

Here

@Robby-

Robby- Mar 29, 2013

Contributor

Ignore blank lines, and comments..

@Robby- Robby- commented on the diff Mar 29, 2013

configure
@@ -1090,11 +1091,11 @@ sub prepare_dynamic_makefile
}
}
-# Routine to list out the extra/ modules that have been enabled.
-# Note: when getting any filenames out and comparing, it's important to lc it if the
-# file system is not case-sensitive (== Epoc, MacOS, OS/2 (incl DOS/DJGPP), VMS, Win32
-# (incl NetWare, Symbian)). Cygwin may or may not be case-sensitive, depending on
-# configuration, however, File::Spec does not currently tell us (it assumes Unix behavior).
+# Routine is to list the extra/ modules that have been enabled
+# Note: when getting any filenames out & comparing, it's important to lc it if the
@Robby-

Robby- Mar 29, 2013

Contributor

And here

@Robby- Robby- commented on the diff Mar 29, 2013

configure
next;
}
- # Get dependencies, and add them to be processed.
+ # obtain dependencies & add them to processing queue
@Robby-

Robby- Mar 29, 2013

Contributor

And here

@Robby-

Robby- Mar 29, 2013

Contributor

This should better be:
Obtain dependencies, and add them to the processing queue.

Lines:

  • 103 - just a really long comment
  • 292/784/1095 - arbitrary, could and should have left it
  • 1203 - again, arbitrary use. i think i just liked the way the character breaks up lines of text that are longer than most of those around them.
    Subnote: You said "Obtain dependencies, and add them to the processing queue." while my text was "obtain dependencies & add them to processing queue" <-- I'm not entirely sure what you are trying to point out there, the only differences are:
    1.) obtain vs. Obtain
    2.) a grammatically-incorrect comma
    3.) the addition of the word "the"
    4.) & vs. and [but that was the original topic of the post anyway]

I feel like you're nit-picking. I am more than happy to take suggestions and I totally agree that formatting and uniformity is vital. I wasn't totally uniform - I'm gonna fix that. However, you don't have to play this charade where you oh-so-subtley point out and call attention to my flaws rather than identifying the root issue, offering a solution, and moving on.

~ DM

Contributor

Robby- commented Mar 29, 2013

Yes, I'm nitpicking, sorry, wasn't trying to take you down or anything. In the end I just want the same as you, and I encourage commits such as these.

@attilamolnar attilamolnar added a commit to attilamolnar/inspircd that referenced this pull request Apr 4, 2014

@attilamolnar attilamolnar Fix typos and update text in configure script
Some of these were picked from #448
365654a

@attilamolnar attilamolnar added a commit to attilamolnar/inspircd that referenced this pull request Apr 4, 2014

@attilamolnar attilamolnar Fix typos and update text in the configure script
Some of these were picked from #448
8ff5898

@attilamolnar attilamolnar added a commit to attilamolnar/inspircd that referenced this pull request Apr 4, 2014

@attilamolnar attilamolnar Fix typos and update text in the configure script
Some of these were picked from #448
6790447

@attilamolnar attilamolnar added a commit that referenced this pull request Apr 4, 2014

@attilamolnar attilamolnar Fix typos and update text in the configure script
Some of these were picked from #448
319091a
Owner

attilamolnar commented Apr 4, 2014

I picked a few changes from this that affected user changing messages, thanks.
(the comments are irrelevant, those are going to be replaced by the new build system in 2.2)

attilamolnar added this to the v2.0.16 milestone Apr 4, 2014

@attilamolnar attilamolnar added a commit that referenced this pull request Apr 4, 2014

@attilamolnar attilamolnar Fix typos and update text in the configure script
Some of these were picked from #448
957676e

@satmd satmd added a commit to satmd/inspircd that referenced this pull request Jun 1, 2014

@attilamolnar @satmd attilamolnar + satmd Fix typos and update text in the configure script
Some of these were picked from #448
cc7cc44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment