Skip to content

Commit cd29efa

Browse files
committed
Merge pull request #1 from una/feature/md
copy edits, case changes, punctuation in docs
2 parents 8676263 + be25ef9 commit cd29efa

22 files changed

+120
-119
lines changed

docs/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
Welcome to the libsass wiki!
1+
Welcome to the LibSass wiki!
22

33
## First Off
4-
LibSass is just a library. To run the code locally (i.e. to compile your stylesheets), you need an implementer. SassC (get it?) is an implementer written in C. There are a number of other implementations of LibSass - for example Node. We encourage you to write your own port - the whole point of Libsass is that we want to bring Sass to many other languages, not just Ruby!
4+
LibSass is just a library. To run the code locally (i.e. to compile your stylesheets), you need an implementer. SassC (get it?) is an implementer written in C. There are a number of other implementations of LibSass - for example Node. We encourage you to write your own port - the whole point of LibSass is that we want to bring Sass to many other languages, not just Ruby!
55

66
We're working hard on moving to full parity with Ruby Sass... learn more at the [The-LibSass-Compatibility-Plan](compatibility-plan.md)!
77

8-
### Implementing libsass
8+
### Implementing LibSass
99

10-
If you're interested in implementing libsass in your own project see the [API Documentation](api-doc.md) which now includes implementing
11-
your own [Sass functions](api-function.md). You may wish to [look at other implementations](implementations.md) for your language of choice.
10+
If you're interested in implementing LibSass in your own project see the [API Documentation](api-doc.md) which now includes implementing
11+
your own [Sass functions](api-function.md). You may wish to [look at other implementations](implementations.md) for your language of choice.
1212
Or make your own!
1313

14-
### Contributing to libsass
14+
### Contributing to LibSass
1515

1616
| Issue Tracker | Issue Triage | Community Guidelines |
1717
|-------------------|----------------------------------|-----------------------------|
18-
| We're always needing help, so checkout our issue tracker, help some people out, and read our article on [Contributing](contributing.md)! It's got all the details on what to do! | To help understand the process of triaging bugs, have a look at our [Issue-Triage](triage.md) document. | Oh, and don't forget we always follow [[Sass Community Guidelines|http://sass-lang.com/community-guidelines]]. Be nice and everyone else will be nice too! |
18+
| We're always needing help, so check out our issue tracker, help some people out, and read our article on [Contributing](contributing.md)! It's got all the details on what to do! | To help understand the process of triaging bugs, have a look at our [Issue-Triage](triage.md) document. | Oh, and don't forget we always follow [[Sass Community Guidelines|http://sass-lang.com/community-guidelines]]. Be nice and everyone else will be nice too! |
1919

20-
Please refer to the steps on [Building Libsass](build.md)
20+
Please refer to the steps on [Building LibSass](build.md)

docs/api-context-internal.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct Sass_Options {
4848
char* input_path;
4949

5050
// The output path is used for source map
51-
// generation. Libsass will not write to
51+
// generation. LibSass will not write to
5252
// this file, it is just used to create
5353
// information in source-maps etc.
5454
char* output_path;
@@ -60,7 +60,8 @@ struct Sass_Options {
6060

6161
// Colon-separated list of paths
6262
// Semicolon-separated on Windows
63-
// Maybe use array interface instead?
63+
// Note: It may be better to use
64+
// array interface instead
6465
char* include_path;
6566
char* plugin_path;
6667

docs/api-context.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ char* input_path;
5252
```
5353
```C
5454
// The output path is used for source map
55-
// generating. Libsass will not write to
55+
// generating. LibSass will not write to
5656
// this file, it is just used to create
5757
// information in source-maps etc.
5858
char* output_path;

docs/api-doc.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
## Introduction
22

3-
Libsass wouldn't be much good without a way to interface with it. These interface documentations describe the various functions and data structures available to implementers. They are split up over three major components, which have all their own source files (plus some common functionality).
3+
LibSass wouldn't be much good without a way to interface with it. These interface documentations describe the various functions and data structures available to implementers. They are split up over three major components, which have all their own source files (plus some common functionality).
44

55
- [Sass Context](api-context.md) - Trigger and handle the main Sass compilation
6-
- [Sass Value](api-value.md) - Exchange values and its format with libsass
7-
- [Sass Function](api-function.md) - Get invoked by libsass for function statments
8-
- [Sass Importer](api-importer.md) - Get invoked by libsass for @import statments
6+
- [Sass Value](api-value.md) - Exchange values and its format with LibSass
7+
- [Sass Function](api-function.md) - Get invoked by LibSass for function statments
8+
- [Sass Importer](api-importer.md) - Get invoked by LibSass for @import statments
99

1010
### Basic usage
1111

12-
First you will need to include the header file!
12+
First you will need to include the header file!
1313
This will automatically load all other headers too!
1414

1515
```C
@@ -18,7 +18,7 @@ This will automatically load all other headers too!
1818

1919
### Deprecated usage
2020

21-
The old API is kept in the source for backward compatibility.
21+
The old API is kept in the source for backward compatibility.
2222
It's deprecated and incompatible with this documentation, use `sass/context.h`!
2323

2424
```C
@@ -33,7 +33,7 @@ It's deprecated and incompatible with this documentation, use `sass/context.h`!
3333
#include "sass/context.h"
3434

3535
int main() {
36-
puts(libsass_version());
36+
puts(libsass_VERSION());
3737
return 0;
3838
}
3939
```
@@ -51,7 +51,7 @@ gcc -Wall version.c -lsass -o version && ./version
5151

5252
## Compiling your code
5353

54-
The most important is your sass file (or string of sass code). With this, you will want to start a libsass compiler. Here is some pseudocode describing the process. The compiler has two different modes: direct input as a string with `Sass_Data_Context` or libsass will do file reading for you by using `Sass_File_Context`. See the code for a list of options available [Sass_Options](https://github.com/sass/libsass/blob/36feef0/include/sass/interface.h#L18)
54+
The most important is your sass file (or string of sass code). With this, you will want to start a LibSass compiler. Here is some pseudocode describing the process. The compiler has two different modes: direct input as a string with `Sass_Data_Context` or LibSass will do file reading for you by using `Sass_File_Context`. See the code for a list of options available [Sass_Options](https://github.com/sass/libsass/blob/36feef0/include/sass/interface.h#L18)
5555

5656
**Building a file compiler**
5757

@@ -108,7 +108,7 @@ struct Sass_Data_context : Sass_Context;
108108
This mirrors very well how `libsass` uses these structures.
109109

110110
- `Sass_Options` holds everything you feed in before the compilation. It also hosts `input_path` and `output_path` options, because they are used to generate/calculate relative links in source-maps. The `input_path` is shared with `Sass_File_Context`.
111-
- `Sass_Context` holds all the data returned by the compilation step.
111+
- `Sass_Context` holds all the data returned by the compilation step.
112112
- `Sass_File_Context` is a specific implementation that requires no additional fields
113113
- `Sass_Data_Context` is a specific implementation that adds the `input_source` field
114114

@@ -126,31 +126,31 @@ Be aware that `libsass` does not write the output file itself. This option merel
126126

127127
## Error Codes
128128

129-
The `error_code` is integer value which indicates the type of error that occurred inside the libsass process. Following is the list of error codes along with the short description:
129+
The `error_code` is integer value which indicates the type of error that occurred inside the LibSass process. Following is the list of error codes along with the short description:
130130

131131
* 1: normal errors like parsing or `eval` errors
132132
* 2: bad allocation error (memory error)
133133
* 3: "untranslated" C++ exception (`throw std::exception`)
134134
* 4: legacy string exceptions ( `throw const char*` or `std::string` )
135135
* 5: Some other unknown exception
136136

137-
Although for the API consumer, error codes do not offer much value except indicating whether *any* error occurred during the compilation, it helps debugging the libsass internal code paths.
137+
Although for the API consumer, error codes do not offer much value except indicating whether *any* error occurred during the compilation, it helps debugging the LibSass internal code paths.
138138

139139
## Real-World Implementations
140140

141-
The proof is in the pudding, so we have highlighted a few implementations that should be on par with the latest libsass interface version. Some of them may not have all features implemented!
141+
The proof is in the pudding, so we have highlighted a few implementations that should be on par with the latest LibSass interface version. Some of them may not have all features implemented!
142142

143143
1. [Perl Example](https://github.com/sass/perl-libsass/blob/master/lib/CSS/Sass.xs)
144144
2. [Go Example](http://godoc.org/github.com/wellington/go-libsass#example-Context-Compile)
145145
3. [Node Example](https://github.com/sass/node-sass/blob/master/src/binding.cpp)
146146

147147
## ABI forward compatibility
148148

149-
We use a functional API to make dynamic linking more robust and future compatible. The API is not yet 100% stable, so we do not yet guarantee ABI forward compatibility. We will do so, once we increase the shared library version above 1.0.
149+
We use a functional API to make dynamic linking more robust and future compatible. The API is not yet 100% stable, so we do not yet guarantee [ABI](https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html) forward compatibility. We will do so, once we increase the shared library version above 1.0.
150150

151151
## Plugins (experimental)
152152

153-
Libsass can load plugins from directories. Just define `plugin_path` on context options to load all plugins from the given directories. To implement plugins, please consult the [[Wiki-Page for plugins|API-Plugins]].
153+
LibSass can load plugins from directories. Just define `plugin_path` on context options to load all plugins from the given directories. To implement plugins, please consult the [[Wiki-Page for plugins|API-Plugins]].
154154

155155
## Internal Structs
156156

0 commit comments

Comments
 (0)